diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-22 03:34:34 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-22 03:34:34 +0100 |
commit | 22063cdd6eca32e83e7937a849e70185a1faee2a (patch) | |
tree | 862509e64a4feb19dfe453f65c78e00e50e553ca /OpenKeychain/src/main/res | |
parent | a7c52a1c9f8bca83b2981347a0eceeec68a92790 (diff) | |
download | open-keychain-22063cdd6eca32e83e7937a849e70185a1faee2a.tar.gz open-keychain-22063cdd6eca32e83e7937a849e70185a1faee2a.tar.bz2 open-keychain-22063cdd6eca32e83e7937a849e70185a1faee2a.zip |
improve status reporting in yubikey dialogue
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_yubikey.xml | 11 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 4 |
2 files changed, 12 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/res/layout/view_key_yubikey.xml b/OpenKeychain/src/main/res/layout/view_key_yubikey.xml index 7da1fc5c4..83272ef4e 100644 --- a/OpenKeychain/src/main/res/layout/view_key_yubikey.xml +++ b/OpenKeychain/src/main/res/layout/view_key_yubikey.xml @@ -21,7 +21,8 @@ card_view:cardBackgroundColor="@android:color/white" card_view:cardElevation="2dp" card_view:cardUseCompatPadding="true" - card_view:cardCornerRadius="4dp"> + card_view:cardCornerRadius="4dp" + android:animateLayoutChanges="true"> <LinearLayout android:layout_width="match_parent" @@ -37,6 +38,8 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" + android:paddingTop="4dp" + android:paddingBottom="4dp" android:orientation="horizontal"> <ImageView @@ -69,6 +72,7 @@ /> <TextView + android:id="@+id/yubikey_status" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" @@ -80,13 +84,14 @@ </LinearLayout> <Button - android:id="@+id/button_import" + android:id="@+id/button_bind" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right|end" - android:text="Import" + android:text="@string/button_bind_key" android:textColor="@color/link_text_material_light" style="?android:attr/borderlessButtonStyle" + android:visibility="gone" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index bcee267fd..f7a9a671e 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1269,5 +1269,9 @@ <string name="unlocked">Unlocked</string> <string name="nfc_settings">Settings</string> <string name="snack_yubikey_view">View</string> + <string name="button_bind_key">Bind Key</string> + <string name="yubikey_serno">"Serial No: %s"</string> + <string name="yubikey_key_holder">"Key holder: "</string> + <string name="yubikey_key_holder_unset">"Key holder: <unset>"</string> </resources> |