Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixes the issue multi-touch causing launcher icons to be not clickable." into rvc-dev am: 94df031718

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

Change-Id: I5bc4dd27fd1fe08ec33b415321d6fc282f3c1b9a
This commit is contained in:
TreeHugger Robot
2020-07-17 17:23:47 +00:00
committed by Automerger Merge Worker
parent bf2c10fe3d 94df031718
commit fed46df3f3
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/widget/TextView.java
View File

@@ -10900,17 +10900,18 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
* not among the handles. * not among the handles.
*/ */
boolean isFromPrimePointer(MotionEvent event, boolean fromHandleView) { boolean isFromPrimePointer(MotionEvent event, boolean fromHandleView) {
boolean res = true;
if (mPrimePointerId == NO_POINTER_ID) { if (mPrimePointerId == NO_POINTER_ID) {
mPrimePointerId = event.getPointerId(0); mPrimePointerId = event.getPointerId(0);
mIsPrimePointerFromHandleView = fromHandleView; mIsPrimePointerFromHandleView = fromHandleView;
} else if (mPrimePointerId != event.getPointerId(0)) { } else if (mPrimePointerId != event.getPointerId(0)) {
return mIsPrimePointerFromHandleView && fromHandleView; res = mIsPrimePointerFromHandleView && fromHandleView;
} }
if (event.getActionMasked() == MotionEvent.ACTION_UP if (event.getActionMasked() == MotionEvent.ACTION_UP
|| event.getActionMasked() == MotionEvent.ACTION_CANCEL) { || event.getActionMasked() == MotionEvent.ACTION_CANCEL) {
mPrimePointerId = -1; mPrimePointerId = -1;
} }
return true; return res;
} }
@Override @Override