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

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

Merge "Fixes the issue multi-touch causing launcher icons to be not... 

Merge "Fixes the issue multi-touch causing launcher icons to be not clickable." into rvc-dev am: 94df0317 am: b2f5bfcf am: 61dda21b am: 68ea95a8

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

Change-Id: I25e4901e09f93949d9e245430f1e7d83fde5fd87
parents e95acf64 68ea95a8

core/java/android/widget/TextView.java

+3 −2
Original line number Diff line number Diff line
@@ -11003,17 +11003,18 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
     *    not among the handles.

     */

    boolean isFromPrimePointer(MotionEvent event, boolean fromHandleView) {

        boolean res = true;

        if (mPrimePointerId == NO_POINTER_ID)  {

            mPrimePointerId = event.getPointerId(0);

            mIsPrimePointerFromHandleView = fromHandleView;

        } else if (mPrimePointerId != event.getPointerId(0)) {

            return mIsPrimePointerFromHandleView && fromHandleView;

            res = mIsPrimePointerFromHandleView && fromHandleView;

        }

        if (event.getActionMasked() == MotionEvent.ACTION_UP

            || event.getActionMasked() == MotionEvent.ACTION_CANCEL) {

            mPrimePointerId = -1;

        }

        return true;

        return res;

    }















    @Override