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

This commit is contained in:
TreeHugger Robot
2020-07-17 17:19:19 +00:00
committed by Android (Google) Code Review

View File

@@ -10900,17 +10900,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