Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1470e59 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Disallow interception of multitouch events" into tm-qpr-dev am: def6a36f am: 283122b1 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21712291



Change-Id: Idfd082b46c87fe75f0a155c0059237de3cb6085d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 772f710b 283122b1

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+7 −2
Original line number Diff line number Diff line
@@ -4720,8 +4720,13 @@ public final class NotificationPanelViewController implements Dumpable { 
             gesture possible. */

            int pointerIndex = event.findPointerIndex(mTrackingPointer);

            if (pointerIndex < 0) {

                if (mTrackingPointer < 0) {

                    pointerIndex = 0;

                    mTrackingPointer = event.getPointerId(pointerIndex);

                } else {

                    mShadeLog.logMotionEvent(event, "Skipping intercept of multitouch pointer");

                    return false;

                }

            }

            final float x = event.getX(pointerIndex);

            final float y = event.getY(pointerIndex);