diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-25 21:53:46 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-25 21:53:46 +0100 |
| commit | a38f84a40169a65bf0eac1e06165a844df9b642c (patch) | |
| tree | 84b05ae65ac65f73d16cc90ef8b4cf1de41c5b56 /OpenKeychain/src/main/res | |
| parent | b521162ef049d223987af4c424083a8355c9bfb0 (diff) | |
| download | open-keychain-a38f84a40169a65bf0eac1e06165a844df9b642c.tar.gz open-keychain-a38f84a40169a65bf0eac1e06165a844df9b642c.tar.bz2 open-keychain-a38f84a40169a65bf0eac1e06165a844df9b642c.zip | |
Dont show verification icons in my key view, hide edit button for non-secret keys
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_activity.xml | 8 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/menu/key_view.xml | 7 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 4 |
3 files changed, 10 insertions, 9 deletions
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index 94f0932f4..7dd30c22c 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -109,14 +109,6 @@ android:src="@drawable/ic_action_verified_cutout" /> <ImageButton - android:id="@+id/view_key_action_edit" - android:layout_width="64dp" - android:layout_height="64dp" - android:visibility="invisible" - style="?android:attr/borderlessButtonStyle" - android:src="@drawable/ic_mode_edit_white_24dp" /> - - <ImageButton android:id="@+id/view_key_action_nfc" android:layout_width="64dp" android:layout_height="64dp" diff --git a/OpenKeychain/src/main/res/menu/key_view.xml b/OpenKeychain/src/main/res/menu/key_view.xml index d2ca90942..86f8ea6a2 100644 --- a/OpenKeychain/src/main/res/menu/key_view.xml +++ b/OpenKeychain/src/main/res/menu/key_view.xml @@ -3,6 +3,13 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> <item + android:id="@+id/menu_key_view_edit" + android:icon="@drawable/ic_mode_edit_white_24dp" + android:visible="false" + app:showAsAction="always" + android:title="@string/key_view_action_edit" /> + + <item android:id="@+id/menu_key_view_refresh" android:icon="@drawable/ic_refresh_white_24dp" app:showAsAction="always" diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 46d6d3e47..067ce20ea 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -98,6 +98,7 @@ <string name="menu_create_key">"Create my key"</string> <string name="menu_import_existing_key">"Import from file"</string> <string name="menu_search">"Search"</string> + <string name="menu_nfc_preferences">"NFC settings"</string> <string name="menu_beam_preferences">"Beam settings"</string> <string name="menu_key_edit_cancel">"Cancel"</string> <string name="menu_encrypt_to">"Encrypt to…"</string> @@ -272,7 +273,8 @@ <!-- errors without preceeding Error: --> <string name="error_jelly_bean_needed">"You need Android 4.1 to use Android's NFC Beam feature!"</string> - <string name="error_nfc_needed">"NFC is not available on your device!"</string> + <string name="error_nfc_needed">"NFC must be enabled!"</string> + <string name="error_beam_needed">"Beam must be enabled!"</string> <string name="error_nothing_import">"No keys found!"</string> <string name="error_contacts_key_id_missing">"Retrieving the key ID from contacts failed!"</string> <string name="error_generic_report_bug">"A generic error occurred, please create a new bug report for OpenKeychain."</string> |