cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve status reporting in yubikey dialogue

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-03-22 03:34:34 +01:00
parent a7c52a1c9f
commit 22063cdd6e
3 changed files with 114 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenKeychain/src/main/res/layout/view_key_yubikey.xml
View File

@@ -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>

4
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -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: &lt;unset&gt;"</string>
</resources>