From 7ccc6d1b9f27697b27558fa004e5aa51654ddfc9 Mon Sep 17 00:00:00 2001 From: Taesu Lee Date: Fri, 2 Aug 2019 15:36:45 +0900 Subject: [PATCH] Ignore unexpected ACTION_DOWN for SIM avatar icons Unexpected ACTION_DOWN raises setColorFilter() for SIM avatar icons in the SIM switcher. However, other actions to clear the filter cannot be received due to no clickable attribute. Test: Click SIM icon in SimSelectorView. Change-Id: Ic5972522a3442e3087c474b65add38a6d00511a5 Signed-off-by: Taesu Lee --- .../android/messaging/ui/conversation/SimIconView.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/com/android/messaging/ui/conversation/SimIconView.java b/src/com/android/messaging/ui/conversation/SimIconView.java index e2e446c..6799bad 100644 --- a/src/com/android/messaging/ui/conversation/SimIconView.java +++ b/src/com/android/messaging/ui/conversation/SimIconView.java @@ -19,6 +19,7 @@ import android.content.Context; import android.graphics.Outline; import android.net.Uri; import android.util.AttributeSet; +import android.view.MotionEvent; import android.view.View; import android.view.ViewOutlineProvider; @@ -43,6 +44,14 @@ public class SimIconView extends ContactIconView { } } + @Override + public boolean onTouchEvent(MotionEvent event) { + if (isClickable()) { + return super.onTouchEvent(event); + } + return true; + } + @Override protected void maybeInitializeOnClickListener() { // TODO: SIM icon view shouldn't consume or handle clicks, but it should if