commit 00228481c9011dae62e4049c458c58af25c5ec95
author Treehugger Robot <treehugger-gerrit@google.com> Mon Aug 12 19:40:44 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 12 19:40:44 2019 +0000
tree 2248f78b0e75cc28633f18fa9513c02ff2e2ae6c
parent 7ccc6d1b9f27697b27558fa004e5aa51654ddfc9
parent b22bc643cecc175e0b320d40a0c381f23c1bf0a6

Merge "Sort ParticipantsData in order of the slot id"

src/com/android/messaging/ui/conversation/SimIconView.java

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.graphics.Outline;
 import android.net.Uri;
 import android.util.AttributeSet;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewOutlineProvider;
 
@@ -44,6 +45,14 @@
     }
 
     @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
         // this is the send button for the only SIM in the device or if MSIM is not supported.