Don't CCO when picking from disambig list.
Fixes http://b/2135189
diff --git a/src/com/android/contacts/ui/FastTrackWindow.java b/src/com/android/contacts/ui/FastTrackWindow.java
index bad8a21..be0e185 100644
--- a/src/com/android/contacts/ui/FastTrackWindow.java
+++ b/src/com/android/contacts/ui/FastTrackWindow.java
@@ -342,7 +342,7 @@
}
boolean hadDecor = mDecor != null;
-
+
if (hadDecor) {
mWindowManager.removeView(mDecor);
mDecor = null;
@@ -380,7 +380,7 @@
}
mShowing = false;
-
+
// Notify any listeners that we've been dismissed
if (mDismissListener != null) {
mDismissListener.onDismiss(this);
@@ -986,17 +986,20 @@
// If showing list, then hide and save state of down arrow
mWasDownArrow = mWasDownArrow || (mArrowDown.getVisibility() == View.VISIBLE);
mArrowDown.setVisibility(View.INVISIBLE);
- mLastChiclet.setChecked(true);
+ mLastChiclet.setChecked(true);
} else {
// If hiding list, restore any down arrow state
mArrowDown.setVisibility(mWasDownArrow ? View.VISIBLE : View.INVISIBLE);
- mLastChiclet.setChecked(false);
+ mLastChiclet.setChecked(false);
}
}
/** {@inheritDoc} */
public void onClick(View v) {
- mLastChiclet = (CheckableImageView)v;
+ if (v instanceof CheckableImageView) {
+ mLastChiclet = (CheckableImageView)v;
+ }
+
final Object tag = v.getTag();
if (tag instanceof Intent) {
// Hide the resolution list, if present