diff options
| author | lookshe <github@lookshe.org> | 2016-03-06 19:42:55 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-06 19:42:55 +0100 |
| commit | 3c400703e082a1b180b35d891b8fb3460c7d5b87 (patch) | |
| tree | 28738dd90fc41b4ab71897f38d324828778ad2e3 /src/main/res/menu/editaccount.xml | |
| parent | 72114d732427266024cdd6e27cd8d1aa60afae2f (diff) | |
| parent | f28d77dc42f6bac5a026e0b1c78562dee8de45ac (diff) | |
Merge branch 'trz/rebase' into trz/rename
Diffstat (limited to 'src/main/res/menu/editaccount.xml')
| -rw-r--r-- | src/main/res/menu/editaccount.xml | 39 |
1 files changed, 30 insertions, 9 deletions
diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml index 4ce9e1f3..9f06fc4c 100644 --- a/src/main/res/menu/editaccount.xml +++ b/src/main/res/menu/editaccount.xml @@ -2,22 +2,43 @@ <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"/> <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:showAsAction="never" + android:title="@string/clear_other_devices"/> + <item + android:id="@+id/action_settings" + android:orderInCategory="100" + android:showAsAction="never" + android:title="@string/action_settings"/> </menu>
\ No newline at end of file |