diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-06 01:08:12 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-06 01:08:12 +0200 |
| commit | 881a50207af0a9f9f5aa69f451110de786779b54 (patch) | |
| tree | 776bf4363c3e8736c3678eba93017387fffd8463 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddUserIdDialogFragment.java | |
| parent | 0bfac9989f801aa93d8bc336307d60b817995688 (diff) | |
| parent | 6ba7536838b8fbc69684bec7c3e847afcb5e9d6a (diff) | |
| download | open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.tar.gz open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.tar.bz2 open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.zip | |
Merge branch 'master' into yubikey
Conflicts:
.gitmodules
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
extern/openpgp-api-lib
settings.gradle
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddUserIdDialogFragment.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddUserIdDialogFragment.java | 9 |
1 files changed, 8 insertions, 1 deletions
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..4d6b13476 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 @@ -29,7 +29,6 @@ import android.os.Messenger; import android.os.RemoteException; import android.support.v4.app.DialogFragment; import android.text.Editable; -import android.text.TextUtils; import android.text.TextWatcher; import android.util.Patterns; import android.view.KeyEvent; @@ -149,6 +148,14 @@ public class AddUserIdDialogFragment extends DialogFragment implements OnEditorA } }); + mName.setThreshold(1); // Start working from first character + mName.setAdapter( + new ArrayAdapter<String> + (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) { |