diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/decrypt_list_entry.xml | 55 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 1 |
2 files changed, 42 insertions, 14 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/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 8dc6573a6..84b5b0376 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1385,7 +1385,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> |