diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/edit_icon.xml | 9 | ||||
| -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 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 3 |
4 files changed, 12 insertions, 16 deletions
diff --git a/OpenKeychain/src/main/res/layout/edit_icon.xml b/OpenKeychain/src/main/res/layout/edit_icon.xml new file mode 100644 index 000000000..f3af5a3dc --- /dev/null +++ b/OpenKeychain/src/main/res/layout/edit_icon.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> + +<ImageView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:padding="0dp" + android:src="@drawable/ic_mode_edit_white_24dp" + style="@style/Widget.AppCompat.ActionButton" /> 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 diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index ee498b969..9962888cd 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -666,8 +666,7 @@ <string name="key_list_fab_import">"Import from File"</string> <!-- Key view --> - <string name="key_view_action_edit_ids">"Edit Identities"</string> - <string name="key_view_action_edit_subkeys">"Edit Subkeys"</string> + <string name="key_view_action_edit">"Edit"</string> <string name="key_view_action_encrypt">"Encrypt text"</string> <string name="key_view_action_encrypt_files">"files"</string> <string name="key_view_action_certify">"Confirm key"</string> |