diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-08-28 11:49:47 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-08-28 11:50:13 +0200 |
| commit | 0aaa93ac041eeb738b38b34e579cc51b613ca6e4 (patch) | |
| tree | 5594da02384a90b73571d57116f4e0364df8e10a | |
| parent | 20f652350a6c56b6a6feb1c46a8c2f554513806d (diff) | |
| download | open-keychain-0aaa93ac041eeb738b38b34e579cc51b613ca6e4.tar.gz open-keychain-0aaa93ac041eeb738b38b34e579cc51b613ca6e4.tar.bz2 open-keychain-0aaa93ac041eeb738b38b34e579cc51b613ca6e4.zip | |
Dont show FAB for expired, revoked keys
| -rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_activity.xml | 4 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index 89e88fdcf..f27938148 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -190,7 +190,9 @@ android:layout_height="wrap_content" android:layout_margin="24dp" android:src="@drawable/ic_qrcode_white_24dp" + android:visibility="invisible" app:layout_anchor="@id/app_bar_layout" - app:layout_anchorGravity="bottom|right|end" /> + app:layout_anchorGravity="bottom|right|end" + tools:visibility="visible" /> </android.support.design.widget.CoordinatorLayout>
\ 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 f810f4bf8..c762b8729 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -114,7 +114,7 @@ <string name="menu_export_all_keys">"Export all keys"</string> <string name="menu_update_all_keys">"Update all keys"</string> <string name="menu_advanced">"Extended information"</string> - <string name="menu_certify_fingerprint">"Confirm via fingerprints"</string> + <string name="menu_certify_fingerprint">"Confirm via fingerprint"</string> <string name="menu_certify_fingerprint_word">"Confirm via words"</string> <string name="menu_export_log">"Export Log"</string> |