diff options
author | Mindy Pereira <mindyp@google.com> | 2012-05-24 14:05:35 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-24 14:05:35 -0700 |
commit | 3a36cf75590c4c4c134bbdd0688b33250af5a607 (patch) | |
tree | f56083c248a20766c3a4a545539fec3aa7561727 /chips/src | |
parent | 932ec21b60a7829e0535b105172045daaed3278e (diff) | |
parent | c75bea26b81d1075fac128188a594aa511d94d9b (diff) | |
download | android_frameworks_ex-3a36cf75590c4c4c134bbdd0688b33250af5a607.tar.gz android_frameworks_ex-3a36cf75590c4c4c134bbdd0688b33250af5a607.tar.bz2 android_frameworks_ex-3a36cf75590c4c4c134bbdd0688b33250af5a607.zip |
Merge "Dont hide the keyboard when showing alternates/ selecting a chip." into jb-dev
Diffstat (limited to 'chips/src')
-rw-r--r-- | chips/src/com/android/ex/chips/RecipientEditTextView.java | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/chips/src/com/android/ex/chips/RecipientEditTextView.java b/chips/src/com/android/ex/chips/RecipientEditTextView.java index 1377ff0..dc67901 100644 --- a/chips/src/com/android/ex/chips/RecipientEditTextView.java +++ b/chips/src/com/android/ex/chips/RecipientEditTextView.java @@ -76,7 +76,6 @@ import android.widget.ListAdapter; import android.widget.ListPopupWindow; import android.widget.ListView; import android.widget.MultiAutoCompleteTextView; -import android.widget.PopupWindow; import android.widget.ScrollView; import android.widget.TextView; @@ -97,7 +96,7 @@ import java.util.regex.Matcher; public class RecipientEditTextView extends MultiAutoCompleteTextView implements OnItemClickListener, Callback, RecipientAlternatesAdapter.OnCheckedItemChangedListener, GestureDetector.OnGestureListener, OnDismissListener, OnClickListener, - PopupWindow.OnDismissListener, TextView.OnEditorActionListener { + TextView.OnEditorActionListener { private static final char COMMIT_CHAR_COMMA = ','; @@ -230,16 +229,13 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements sSelectedTextColor = context.getResources().getColor(android.R.color.white); } mAlternatesPopup = new ListPopupWindow(context); - mAlternatesPopup.setOnDismissListener(this); mAddressPopup = new ListPopupWindow(context); - mAddressPopup.setOnDismissListener(this); mCopyDialog = new Dialog(context); mAlternatesListener = new OnItemClickListener() { @Override public void onItemClick(AdapterView<?> adapterView,View view, int position, long rowId) { mAlternatesPopup.setOnItemClickListener(null); - setEnabled(true); replaceChip(mSelectedChip, ((RecipientAlternatesAdapter) adapterView.getAdapter()) .getRecipientEntry(position)); Message delayed = Message.obtain(mHandler, DISMISS); @@ -1357,7 +1353,6 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements // Align the alternates popup with the left side of the View, // regardless of the position of the chip tapped. alternatesPopup.setWidth(width); - setEnabled(false); alternatesPopup.setAnchorView(this); alternatesPopup.setVerticalOffset(bottom); alternatesPopup.setAdapter(createAlternatesAdapter(currentChip)); @@ -1377,12 +1372,6 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements } } - // Dismiss listener for alterns and single address popup. - @Override - public void onDismiss() { - setEnabled(true); - } - private ListAdapter createAlternatesAdapter(RecipientChip chip) { return new RecipientAlternatesAdapter(getContext(), chip.getContactId(), chip.getDataId(), mAlternatesLayout, ((BaseRecipientAdapter)getAdapter()).getQueryType(), this); @@ -1904,7 +1893,6 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements int bottom = calculateOffsetFromBottom(line); // Align the alternates popup with the left side of the View, // regardless of the position of the chip tapped. - setEnabled(false); popup.setWidth(width); popup.setAnchorView(this); popup.setVerticalOffset(bottom); |