commit c6f9c1b9fd24a8a4e8a5301f555e49c45f4a6bf2
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Feb 26 23:49:23 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 26 23:49:23 2018 +0000
tree d22a0219eb315f205e76a083e17cee9eaa1798c0
parent 44783f1901d808b98058c444c306718c5b832128
parent 01b729f2b45884836edb7627723b56ff692e05c3

Merge "Allow TouchDelegate to forward non-primary pointer"

core/java/android/view/TouchDelegate.java

diff --git a/core/java/android/view/TouchDelegate.java b/core/java/android/view/TouchDelegate.java
index dc50fa1..d6c43e8 100644
--- a/core/java/android/view/TouchDelegate.java
+++ b/core/java/android/view/TouchDelegate.java
@@ -105,11 +105,13 @@
         boolean hit = true;
         boolean handled = false;
 
-        switch (event.getAction()) {
+        switch (event.getActionMasked()) {
             case MotionEvent.ACTION_DOWN:
                 mDelegateTargeted = mBounds.contains(x, y);
                 sendToDelegate = mDelegateTargeted;
                 break;
+            case MotionEvent.ACTION_POINTER_DOWN:
+            case MotionEvent.ACTION_POINTER_UP:
             case MotionEvent.ACTION_UP:
             case MotionEvent.ACTION_MOVE:
                 sendToDelegate = mDelegateTargeted;