Merge "Ensure delete listener is set for chips" into ub-chips-cranbrook
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 @@
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 @@
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 void setDropdownChipLayouter(DropdownChipLayouter dropdownChipLayouter) {
mDropdownChipLayouter = dropdownChipLayouter;
+ mDropdownChipLayouter.setDeleteListener(this);
}
public void setRecipientEntryItemClickedListener(RecipientEntryItemClickedListener listener) {