diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-05 01:21:24 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-05 01:21:24 +0200 |
| commit | dff68ac194d71d8a283ec80a1e8640da3bfd3e44 (patch) | |
| tree | ed6f30fc86ca674febeeb09a7d91fe7b1c1042d4 /OpenKeychain/src/main | |
| parent | 15165d056f182c008276200d177bf057f5164da8 (diff) | |
| download | open-keychain-dff68ac194d71d8a283ec80a1e8640da3bfd3e44.tar.gz open-keychain-dff68ac194d71d8a283ec80a1e8640da3bfd3e44.tar.bz2 open-keychain-dff68ac194d71d8a283ec80a1e8640da3bfd3e44.zip | |
more layout neatification
Diffstat (limited to 'OpenKeychain/src/main')
3 files changed, 22 insertions, 4 deletions
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/multi_certify_key_fragment.xml b/OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml index 34727f989..f65327089 100644 --- a/OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml @@ -23,10 +23,27 @@ 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 e61f4912a..6c26ff2f9 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> |