diff options
| author | Jin Cao <jinyan@google.com> | 2014-08-07 01:36:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-06 23:54:36 +0000 |
| commit | 4d0425d48a54b684d7c1af824b14b3bdf0cfa4ce (patch) | |
| tree | f50955cd2ea3c9c9d1b0a33d993a25cd810fad59 | |
| parent | 33515e70c6dc7b488bc0aa62f6a009bec4bf8812 (diff) | |
| parent | a20a8d02c0b6a9440a61870ee6c7a6b6c92fbf4b (diff) | |
| download | android_frameworks_opt_chips-4d0425d48a54b684d7c1af824b14b3bdf0cfa4ce.tar.gz android_frameworks_opt_chips-4d0425d48a54b684d7c1af824b14b3bdf0cfa4ce.tar.bz2 android_frameworks_opt_chips-4d0425d48a54b684d7c1af824b14b3bdf0cfa4ce.zip | |
Merge "Ensure delete listener is set for chips" into ub-chips-cranbrook
| -rw-r--r-- | src/com/android/ex/chips/DropdownChipLayouter.java | 6 | ||||
| -rw-r--r-- | src/com/android/ex/chips/RecipientEditTextView.java | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/com/android/ex/chips/DropdownChipLayouter.java b/src/com/android/ex/chips/DropdownChipLayouter.java index 6c9a694..f88ea7d 100644 --- a/src/com/android/ex/chips/DropdownChipLayouter.java +++ b/src/com/android/ex/chips/DropdownChipLayouter.java @@ -42,14 +42,8 @@ public class DropdownChipLayouter { private Query mQuery; public DropdownChipLayouter(LayoutInflater inflater, Context context) { - this(inflater, context, null); - } - - public DropdownChipLayouter(LayoutInflater inflater, Context context, - ChipDeleteListener deleteListener) { mInflater = inflater; mContext = context; - mDeleteListener = deleteListener; } public void setQuery(Query query) { diff --git a/src/com/android/ex/chips/RecipientEditTextView.java b/src/com/android/ex/chips/RecipientEditTextView.java index 6a892f3..aa330bd 100644 --- a/src/com/android/ex/chips/RecipientEditTextView.java +++ b/src/com/android/ex/chips/RecipientEditTextView.java @@ -331,8 +331,7 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements mGestureDetector = new GestureDetector(context, this); setOnEditorActionListener(this); - setDropdownChipLayouter(new DropdownChipLayouter(LayoutInflater.from(context), context, - this)); + setDropdownChipLayouter(new DropdownChipLayouter(LayoutInflater.from(context), context)); } private int calculateTextHeight() { @@ -352,6 +351,7 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements public void setDropdownChipLayouter(DropdownChipLayouter dropdownChipLayouter) { mDropdownChipLayouter = dropdownChipLayouter; + mDropdownChipLayouter.setDeleteListener(this); } public void setRecipientEntryItemClickedListener(RecipientEntryItemClickedListener listener) { |