am 2797dbd5: am 3a36cf75: Merge "Dont hide the keyboard when showing alternates/ selecting a chip." into jb-dev
* commit '2797dbd5ffe5affe7de61373dac70b6af755fab4':
Dont hide the keyboard when showing alternates/ selecting a chip.
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.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 @@
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 @@
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 @@
// 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 @@
}
}
- // 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 @@
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);