diff options
author | Christian S <christian@pix-art.de> | 2016-02-14 17:00:16 +0100 |
---|---|---|
committer | Christian S <christian@pix-art.de> | 2016-02-14 17:00:16 +0100 |
commit | 5e64737d532e493c00ab579ce8bd4695c4a5a5a2 (patch) | |
tree | b82e1131467da94f4f3f58c51bf99dc26add4fc0 /src/main/res/menu/editaccount.xml | |
parent | 1a6062cc17c421a66d7dbac0389dc7b3a19e3a5f (diff) | |
parent | 300326fba3a63fce546d952ac455758ed2cbeca0 (diff) |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/res/menu/editaccount.xml')
-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 b7a404182..9f06fc4c4 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" |