Merge branch 'master' of github.com:open-keychain/open-keychain

4 files changed, 54 insertions, 15 deletions

diff --git a/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml b/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
index 4a79f0ccd..8bdfce733 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
@@ -26,7 +26,6 @@
         android:measureAllChildren="false"
         custom:initialView="1"
         android:minHeight="?listPreferredItemHeightSmall"
-        android:animateLayoutChanges="true"
         >
 
         <LinearLayout
@@ -113,6 +112,7 @@
                     android:id="@+id/result_signature_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:padding="4dp"
                     android:src="@drawable/status_signature_unverified_cutout_24dp"
                     />
@@ -136,6 +136,7 @@
                 android:clickable="true"
                 android:background="?android:selectableItemBackground"
                 android:orientation="horizontal"
+                android:minHeight="40dp"
                 >
 
                 <LinearLayout
@@ -144,7 +145,7 @@
                     android:layout_weight="1"
                     android:paddingRight="4dp"
                     android:paddingLeft="4dp"
-                    android:gravity="center_vertical"
+                    android:layout_gravity="center_vertical"
                     android:orientation="vertical">
 
                     <TextView
@@ -162,6 +163,8 @@
                         android:layout_height="wrap_content"
                         android:gravity="center_vertical"
                         android:text=""
+                        android:singleLine="true"
+                        android:ellipsize="end"
                         tools:text="alice@example.com" />
 
                 </LinearLayout>
@@ -174,19 +177,45 @@
                     android:layout_marginTop="8dp"
                     android:background="?android:attr/listDivider" />
 
-                <TextView
-                    android:id="@+id/result_signature_action"
-                    android:paddingLeft="8dp"
-                    android:paddingRight="8dp"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
+                <org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:drawableRight="@drawable/ic_vpn_key_grey_24dp"
-                    android:drawablePadding="8dp"
-                    android:gravity="center_vertical"
-                    android:text=""
-                    tools:text="Show"
-                    />
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:id="@+id/result_signature_action"
+                    android:measureAllChildren="true"
+                    android:inAnimation="@anim/fade_in"
+                    android:outAnimation="@anim/fade_out"
+                    custom:initialView="0"
+                    >
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:drawableRight="@drawable/ic_vpn_key_grey_24dp"
+                        android:drawablePadding="8dp"
+                        android:text="@string/decrypt_result_action_show"
+                        />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:drawableRight="@drawable/ic_file_download_grey_24dp"
+                        android:drawablePadding="8dp"
+                        android:text="@string/decrypt_result_action_Lookup"
+                        />
+
+                    <ProgressBar
+                        android:layout_width="30dp"
+                        android:layout_height="30dp"
+                        android:padding="4dp"
+                        android:layout_gravity="center" />
+
+                </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
 
             </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml
index 80be0ec34..d9e7170c5 100644
--- a/OpenKeychain/src/main/res/layout/key_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_item.xml
@@ -123,7 +123,8 @@
             android:layout_gravity="center"
             android:src="@drawable/ic_repeat_grey_24dp"
             android:padding="12dp"
-            android:background="?android:selectableItemBackground" />
+            android:background="?android:selectableItemBackground"
+            android:contentDescription="@string/cd_exchange_keys"/>
 
     </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index 560180407..7c021bec2 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -94,6 +94,7 @@
 
                     <ImageButton
                         android:id="@+id/view_key_action_encrypt_files"
+                        android:contentDescription="@string/cd_encrypt_files"
                         style="?android:attr/borderlessButtonStyle"
                         android:layout_width="64dp"
                         android:layout_height="64dp"
@@ -103,6 +104,7 @@
 
                     <ImageButton
                         android:id="@+id/view_key_action_encrypt_text"
+                        android:contentDescription="@string/cd_encrypt_text"
                         style="?android:attr/borderlessButtonStyle"
                         android:layout_width="64dp"
                         android:layout_height="64dp"
@@ -113,6 +115,7 @@
                     <ImageButton
                         android:id="@+id/view_key_action_nfc"
                         style="?android:attr/borderlessButtonStyle"
+                        android:contentDescription="@string/cd_share_nfc"
                         android:layout_width="64dp"
                         android:layout_height="64dp"
                         android:src="@drawable/ic_nfc_white_24dp"
@@ -213,6 +216,7 @@
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/fab"
+        android:contentDescription="@string/cd_exchange_keys"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="24dp"
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 8dc6573a6..ff148b0c7 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -106,6 +106,12 @@
     <string name="btn_saved">"Saved!"</string>
     <string name="btn_not_matching">"Doesn't match"</string>
 
+    <!-- Content Description -->
+    <string name="cd_encrypt_files">"Encrypt Files"</string>
+    <string name="cd_exchange_keys">"Exchange Keys"</string>
+    <string name="cd_encrypt_text">"Encrypt Text"</string>
+    <string name="cd_share_nfc">"Share Via NFC"</string>
+
     <!-- menu -->
     <string name="menu_preferences">"Settings"</string>
     <string name="menu_help">"Help"</string>
@@ -1385,7 +1391,6 @@
     <string name="msg_data_detached_trailing">"Skipping trailing data after signed part!"</string>
     <string name="msg_data_detached_unsupported">"Unsupported type of detached signature!"</string>
     <string name="msg_data_error_io">"Error reading input data!"</string>
-    <string name="msg_data_error_openpgp">"Error processing OpenPGP data!"</string>
     <string name="msg_data_mime_bad">"Could not parse as MIME data"</string>
     <string name="msg_data_mime_filename">"Filename: '%s'"</string>
     <string name="msg_data_mime_from_extension">"Guessing MIME type from extension"</string>