Hide attachment from top bar and show encryption lock

This commit is contained in:
Arne 2024-09-07 08:55:00 +02:00
parent 99f1802171
commit 13b2161a83

View file

@ -24,12 +24,32 @@
android:title="@string/video_call" /> android:title="@string/video_call" />
</menu> </menu>
</item> </item>
<item
android:id="@+id/action_security"
android:icon="@drawable/ic_lock_open_outline_24dp"
android:orderInCategory="29"
android:title="@string/encryption"
app:showAsAction="always">
<menu>
<group android:checkableBehavior="single">
<item
android:id="@+id/encryption_choice_none"
android:title="@string/encryption_choice_unencrypted" />
<item
android:id="@+id/encryption_choice_axolotl"
android:title="@string/encryption_choice_omemo" />
<item
android:id="@+id/encryption_choice_pgp"
android:title="@string/encryption_choice_pgp" />
</group>
</menu>
</item>
<item <item
android:id="@+id/action_attach_file" android:id="@+id/action_attach_file"
android:icon="@drawable/ic_attach_file_24dp" android:icon="@drawable/ic_attach_file_24dp"
android:orderInCategory="30" android:orderInCategory="30"
android:title="@string/attach_file" android:title="@string/attach_file"
app:showAsAction="always"> app:showAsAction="ifRoom">
<menu> <menu>
<item <item
@ -65,12 +85,12 @@
<item <item
android:id="@+id/attach_webxdc" android:id="@+id/attach_webxdc"
android:icon="@drawable/toys_and_games_24dp" android:icon="@drawable/toys_and_games_24dp"
android:title="Choose Widget" /> android:title="@string/choose_widget" />
<item <item
android:id="@+id/attach_subject" android:id="@+id/attach_subject"
android:icon="@drawable/subject" android:icon="@drawable/subject"
android:title="Add Subject" /> android:title="@string/add_subject" />
<item <item
android:id="@+id/attach_schedule" android:id="@+id/attach_schedule"
android:icon="@drawable/schedule_message" android:icon="@drawable/schedule_message"
@ -104,26 +124,6 @@
android:orderInCategory="60" android:orderInCategory="60"
android:title="@string/action_archive_chat" android:title="@string/action_archive_chat"
app:showAsAction="never" /> app:showAsAction="never" />
<item
android:id="@+id/action_security"
android:icon="@drawable/ic_lock_open_outline_24dp"
android:orderInCategory="65"
android:title="Encryption"
app:showAsAction="never">
<menu>
<group android:checkableBehavior="single">
<item
android:id="@+id/encryption_choice_none"
android:title="@string/encryption_choice_unencrypted" />
<item
android:id="@+id/encryption_choice_axolotl"
android:title="@string/encryption_choice_omemo" />
<item
android:id="@+id/encryption_choice_pgp"
android:title="@string/encryption_choice_pgp" />
</group>
</menu>
</item>
<item <item
android:orderInCategory="70" android:orderInCategory="70"
android:title="@string/more_options"> android:title="@string/more_options">