From 4979ccd645e605f66afd9e4e6174dd7f27687e1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Mon, 4 Aug 2014 00:49:16 +0200 Subject: Smaller UI fixes --- OpenKeychain/src/main/AndroidManifest.xml | 43 ++++++++--------- .../keychain/ui/EncryptActivity.java | 2 +- .../keychain/ui/EncryptAsymmetricFragment.java | 1 + .../ui/dialog/AddUserIdDialogFragment.java | 8 ++++ .../res/layout/encrypt_asymmetric_fragment.xml | 54 +++++++++++----------- .../src/main/res/menu/encrypt_activity.xml | 2 +- OpenKeychain/src/main/res/values/strings.xml | 5 +- 7 files changed, 59 insertions(+), 56 deletions(-) (limited to 'OpenKeychain/src/main') diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index de559fe16..df5eaa69e 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -50,6 +50,7 @@ android:required="false" /> + @@ -155,8 +156,9 @@ + - + @@ -174,26 +176,16 @@ android:label="@string/title_decrypt" android:windowSoftInputMode="stateHidden"> - - - - - - - - - - - - - + + + - - + + - - - + + + @@ -206,8 +198,9 @@ + - + @@ -227,7 +220,7 @@ - + @@ -649,10 +642,10 @@ + android:name=".provider.TemporaryStorageProvider" + android:authorities="org.sufficientlysecure.keychain.tempstorage" + android:writePermission="org.sufficientlysecure.keychain.WRITE_TEMPORARY_STORAGE" + android:exported="true" /> diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java index 303db60ed..211802717 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java @@ -489,7 +489,7 @@ public class EncryptActivity extends DrawerActivity implements EncryptActivityIn * Android's Action */ if (Intent.ACTION_SEND.equals(action) && type != null) { - // When sending to APG Encrypt via share menu + // When sending to OpenKeychain Encrypt via share menu if ("text/plain".equals(type)) { // Plain text String sharedText = intent.getStringExtra(Intent.EXTRA_TEXT); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java index ed3be0e7f..3de617ca0 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java @@ -115,6 +115,7 @@ public class EncryptAsymmetricFragment extends Fragment implements EncryptActivi } }); mEncryptKeyView = (EncryptKeyCompletionView) view.findViewById(R.id.recipient_list); + mEncryptKeyView.setThreshold(1); // Start working from first character return view; } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddUserIdDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddUserIdDialogFragment.java index d5264ae10..226bdf51e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddUserIdDialogFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddUserIdDialogFragment.java @@ -149,6 +149,14 @@ public class AddUserIdDialogFragment extends DialogFragment implements OnEditorA } }); + mName.setThreshold(1); // Start working from first character + mName.setAdapter( + new ArrayAdapter + (getActivity(), android.R.layout.simple_spinner_dropdown_item, + ContactHelper.getPossibleUserNames(getActivity()) + ) + ); + alert.setNegativeButton(android.R.string.cancel, new OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml index e9e439d65..4d82477bc 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml @@ -1,39 +1,39 @@ + - + android:padding="0dp" + android:layout_margin="0dp" + style="@android:style/Widget.EditText"> - + android:paddingLeft="12dp" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/label_asymmetric_from" /> + + android:id="@+id/sign" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" /> + android:id="@+id/recipient_list" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> \ No newline at end of file diff --git a/OpenKeychain/src/main/res/menu/encrypt_activity.xml b/OpenKeychain/src/main/res/menu/encrypt_activity.xml index c852fbb5c..05d85ee2a 100644 --- a/OpenKeychain/src/main/res/menu/encrypt_activity.xml +++ b/OpenKeychain/src/main/res/menu/encrypt_activity.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index fca17f837..6abca0548 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -113,12 +113,13 @@ Repeat Passphrase Algorithm ASCII Armor + Files: ASCII Armor Let others know that you\'re using OpenKeychain Writes \'OpenKeychain v2.7\' to OpenPGP signatures, ciphertext, and exported keys Recipients From: To - Delete After Encryption + Files: Delete After Encryption Delete After Decryption Share After Encryption Encryption Algorithm @@ -538,7 +539,7 @@ My Keys - Write message here to encrypt and/or sign… + The message entered here will be signed using the key selected in \'From\' and encrypted for all recipients selected in \'To\'. Enter ciphertext here to decrypt and/or verify… -- cgit v1.2.3