aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-03-22 03:34:34 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-03-22 03:34:34 +0100
commit22063cdd6eca32e83e7937a849e70185a1faee2a (patch)
tree862509e64a4feb19dfe453f65c78e00e50e553ca /OpenKeychain/src/main/res/layout
parenta7c52a1c9f8bca83b2981347a0eceeec68a92790 (diff)
downloadopen-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/layout')
-rw-r--r--OpenKeychain/src/main/res/layout/view_key_yubikey.xml11
1 files changed, 8 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>