diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-26 01:02:22 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-26 01:02:22 +0200 |
commit | 1865852cccccf0b78ffe8bcdc0cfbca66ddebfdc (patch) | |
tree | add2f0d85813f9ece1be3c926b4ae8f221d7cf47 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/NameEditText.java | |
parent | d6d678dae3ed5d794a9aa5e289197d264f6a7ff9 (diff) | |
parent | c442d3bd0d3bac96614d3d5c0e833a42cab4706e (diff) | |
download | open-keychain-1865852cccccf0b78ffe8bcdc0cfbca66ddebfdc.tar.gz open-keychain-1865852cccccf0b78ffe8bcdc0cfbca66ddebfdc.tar.bz2 open-keychain-1865852cccccf0b78ffe8bcdc0cfbca66ddebfdc.zip |
Merge remote-tracking branch 'origin/development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
OpenKeychain/src/main/res/menu/decrypt_menu.xml
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/NameEditText.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/NameEditText.java | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/NameEditText.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/NameEditText.java index 153bf2ff2..1a034537c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/NameEditText.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/NameEditText.java @@ -17,17 +17,15 @@ package org.sufficientlysecure.keychain.ui.widget; -import android.annotation.TargetApi; import android.content.Context; -import android.os.Build; +import android.support.v7.widget.AppCompatAutoCompleteTextView; import android.util.AttributeSet; import android.view.inputmethod.EditorInfo; import android.widget.ArrayAdapter; -import android.widget.AutoCompleteTextView; import org.sufficientlysecure.keychain.util.ContactHelper; -public class NameEditText extends AutoCompleteTextView { +public class NameEditText extends AppCompatAutoCompleteTextView { public NameEditText(Context context) { super(context); init(); @@ -43,12 +41,6 @@ public class NameEditText extends AutoCompleteTextView { init(); } - @TargetApi(Build.VERSION_CODES.LOLLIPOP) - public NameEditText(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - init(); - } - private void init() { reenableKeyboardSuggestions(); initAdapter(); |