diff options
5 files changed, 28 insertions, 11 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java index 8827eade8..026051715 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java @@ -211,7 +211,7 @@ public class MultiCertifyKeyFragment extends LoaderFragment return new CursorLoader(mActivity, uri, USER_IDS_PROJECTION, selection, ids, Tables.USER_IDS + "." + UserIds.MASTER_KEY_ID + " ASC" - + "," + Tables.USER_IDS + "." + UserIds.USER_ID + " ASC" + + ", " + Tables.USER_IDS + "." + UserIds.USER_ID + " ASC" ); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java index 69e94bdbb..9e48efab0 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java @@ -88,7 +88,7 @@ public class MultiUserIdsAdapter extends CursorAdapter { if (isHeader == 1) { long masterKeyId = cursor.getLong(0); vHeader.setVisibility(View.VISIBLE); - vHeaderId.setText(KeyFormattingUtils.beautifyKeyId(masterKeyId)); + vHeaderId.setText(KeyFormattingUtils.beautifyKeyIdWithPrefix(mContext, masterKeyId)); } else { vHeader.setVisibility(View.GONE); } diff --git a/OpenKeychain/src/main/res/layout/keyspinner_item.xml b/OpenKeychain/src/main/res/layout/keyspinner_item.xml index 411ceefdf..16a20542b 100644 --- a/OpenKeychain/src/main/res/layout/keyspinner_item.xml +++ b/OpenKeychain/src/main/res/layout/keyspinner_item.xml @@ -2,12 +2,12 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:minHeight="24dp" android:gravity="center_vertical" android:singleLine="true" android:orientation="horizontal" android:descendantFocusability="blocksDescendants" - android:focusable="false"> + android:focusable="false" + android:minHeight="44dip"> <LinearLayout android:layout_width="0dip" @@ -18,8 +18,7 @@ android:orientation="vertical" android:paddingLeft="8dp" android:paddingRight="4dp" - android:paddingTop="4dp" - android:paddingBottom="4dp"> + > <TextView android:id="@+id/keyspinner_key_name" @@ -53,6 +52,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:src="@drawable/status_signature_revoked_cutout" - android:padding="16dp" /> + android:paddingLeft="16dp" + android:paddingRight="16dp"/> </LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml b/OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml index c55be78fb..f65327089 100644 --- a/OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml @@ -20,14 +20,30 @@ style="@style/SectionHeader" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="4dp" android:layout_marginTop="14dp" android:text="@string/section_certification_key" /> - <org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner - android:id="@+id/certify_key_spinner" + <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + android:padding="0dp" + android:layout_margin="0dp"> + + <TextView + android:paddingLeft="8dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/key_colon" + android:paddingRight="8dp" /> + + <org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner + android:id="@+id/certify_key_spinner" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + </LinearLayout> <TextView style="@style/SectionHeader" diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 36537bc92..eaac43f7e 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -964,6 +964,7 @@ <string name="swipe_to_update">"Swipe down to update from keyserver"</string> <string name="error_no_file_selected">"Select at least one file to encrypt!"</string> <string name="error_multi_not_supported">"Saving of multiple files not supported. This is a limitation on current Android."</string> + <string name="key_colon">"Key:"</string> <!-- First Time --> <string name="first_time_text1">"Take back your privacy with OpenKeychain!"</string> |