diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-11-15 23:24:20 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-12-27 15:00:14 +0100 |
| commit | aca0cd340bda38cc15547aa5a116c679782ff740 (patch) | |
| tree | 18d843a31002c8893f55e2f6499541162c22e4fa /OpenKeychain/src/main/res/menu | |
| parent | 69220cb4c0466112426e7d10f865da834b464d90 (diff) | |
| download | open-keychain-aca0cd340bda38cc15547aa5a116c679782ff740.tar.gz open-keychain-aca0cd340bda38cc15547aa5a116c679782ff740.tar.bz2 open-keychain-aca0cd340bda38cc15547aa5a116c679782ff740.zip | |
inline-edit: move action mode menu handling int activity
Diffstat (limited to 'OpenKeychain/src/main/res/menu')
| -rw-r--r-- | OpenKeychain/src/main/res/menu/action_mode_edit.xml (renamed from OpenKeychain/src/main/res/menu/edit_user_id.xml) | 4 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/menu/edit_subkeys.xml | 12 |
2 files changed, 2 insertions, 14 deletions
diff --git a/OpenKeychain/src/main/res/menu/edit_user_id.xml b/OpenKeychain/src/main/res/menu/action_mode_edit.xml index 617dae841..edbebac8b 100644 --- a/OpenKeychain/src/main/res/menu/edit_user_id.xml +++ b/OpenKeychain/src/main/res/menu/action_mode_edit.xml @@ -3,9 +3,9 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> <item - android:id="@+id/menu_edit_user_ids" + android:id="@+id/menu_action_mode_edit" android:icon="@drawable/ic_mode_edit_white_24dp" - android:title="@string/key_view_action_edit_ids" + android:title="@string/key_view_action_edit" app:showAsAction="always" /> diff --git a/OpenKeychain/src/main/res/menu/edit_subkeys.xml b/OpenKeychain/src/main/res/menu/edit_subkeys.xml deleted file mode 100644 index f9f75ebbb..000000000 --- a/OpenKeychain/src/main/res/menu/edit_subkeys.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> - - <item - android:id="@+id/menu_edit_subkeys" - android:icon="@drawable/ic_mode_edit_white_24dp" - android:title="@string/key_view_action_edit_subkeys" - app:showAsAction="always" - /> - -</menu>
\ No newline at end of file |