diff options
| author | Christian Schneppe <christian@pix-art.de> | 2019-01-26 15:07:28 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2019-01-26 15:07:28 +0100 |
| commit | f2d502518ea3de673c7f0ebf425f53295f620f2f (patch) | |
| tree | 2db8f4e334d51b59c35105bc1871b102f4bb34d3 /src/main/res/menu | |
| parent | 2773c19c429c4bcb99fd0144cd1b3e2346cab962 (diff) | |
rework backup & restore
use the implementation from Conversations
Diffstat (limited to 'src/main/res/menu')
| -rw-r--r-- | src/main/res/menu/editaccount.xml | 5 | ||||
| -rw-r--r-- | src/main/res/menu/manageaccounts.xml | 16 |
2 files changed, 15 insertions, 6 deletions
diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml index 09919b9fe..59667c1c7 100644 --- a/src/main/res/menu/editaccount.xml +++ b/src/main/res/menu/editaccount.xml @@ -26,6 +26,11 @@ </item> <item + android:id="@+id/action_import_backup" + android:title="@string/restore_backup" + app:showAsAction="never" /> + + <item android:id="@+id/action_show_qr_code" android:icon="@drawable/ic_qrcode_white_24dp" android:title="@string/show_qr_code" diff --git a/src/main/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml index 044c715c5..3199fc2be 100644 --- a/src/main/res/menu/manageaccounts.xml +++ b/src/main/res/menu/manageaccounts.xml @@ -5,18 +5,22 @@ <item android:id="@+id/action_add_account" android:icon="?attr/icon_add_person" - app:showAsAction="always" - android:title="@string/action_add_account" /> + android:title="@string/action_add_account" + app:showAsAction="always" /> + <item + android:id="@+id/action_import_backup" + android:title="@string/restore_backup" + app:showAsAction="never" /> <item android:id="@+id/action_add_account_with_cert" - app:showAsAction="never" android:icon="?attr/icon_add_person" android:title="@string/action_add_account_with_certificate" - android:visible="true" /> + android:visible="true" + app:showAsAction="never" /> <item android:id="@+id/action_settings" android:orderInCategory="100" - app:showAsAction="never" - android:title="@string/action_settings" /> + android:title="@string/action_settings" + app:showAsAction="never" /> </menu>
\ No newline at end of file |