diff options
| author | lookshe <github@lookshe.org> | 2016-02-16 11:41:54 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-02-16 11:41:54 +0100 |
| commit | 1e40764b20a08170f8e4bfe1f1ae1559111f2961 (patch) | |
| tree | 1791a3870361f37c3c34c299d075f56ed4a6e2c2 /src/main/res/menu | |
| parent | a049aff638f27b68f08c753d42ef0fc2847b96cb (diff) | |
| parent | d58d822215708cc0d9c841872abab448bf290e4c (diff) | |
Merge tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4
Conflicts:
build.gradle
src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java
src/main/java/eu/siacs/conversations/parser/PresenceParser.java
src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
src/main/res/values/arrays.xml
Diffstat (limited to 'src/main/res/menu')
| -rw-r--r-- | src/main/res/menu/editaccount.xml | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml index b7a40418..9f06fc4c 100644 --- a/src/main/res/menu/editaccount.xml +++ b/src/main/res/menu/editaccount.xml @@ -2,35 +2,40 @@ <item android:id="@+id/action_show_qr_code" - android:title="@string/show_qr_code" - android:showAsAction="never" /> + android:showAsAction="never" + android:title="@string/show_qr_code"/> <item android:id="@+id/action_show_block_list" - android:title="@string/show_block_list" - android:showAsAction="never" /> + android:showAsAction="never" + android:title="@string/show_block_list"/> <item android:id="@+id/action_renew_certificate" + android:showAsAction="never" android:title="@string/action_renew_certificate" - android:visible="false" - android:showAsAction="never" /> - /> + android:visible="false"/> <item android:id="@+id/action_server_info_show_more" - android:title="@string/server_info_show_more" android:checkable="true" android:checked="false" - android:showAsAction="never" /> + android:showAsAction="never" + android:title="@string/server_info_show_more"/> + + <item + android:id="@+id/action_mam_prefs" + android:title="@string/mam_prefs"/> - <item android:id="@+id/action_change_password_on_server" - android:title="@string/change_password" - android:showAsAction="never" /> + <item + android:id="@+id/action_change_password_on_server" + android:showAsAction="never" + android:title="@string/change_password"/> - <item android:id="@+id/action_clear_devices" - android:title="@string/clear_other_devices" - android:showAsAction="never"/> + <item + android:id="@+id/action_clear_devices" + android:showAsAction="never" + android:title="@string/clear_other_devices"/> <item android:id="@+id/action_settings" android:orderInCategory="100" |