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

Merge "Makes the multi-touch prevention only works for editable TextView." into rvc-qpr-dev am: b72c8a096b

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

Change-Id: Ie3f9e6e8e00f4a647dc6f9d317763601cdc26adb
This commit is contained in:
TreeHugger Robot
2020-11-26 06:45:47 +00:00
committed by Automerger Merge Worker
parent 3e8d93eef8 b72c8a096b
commit 94b24197c3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11009,12 +11009,12 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
MotionEvent.actionToString(event.getActionMasked()), MotionEvent.actionToString(event.getActionMasked()),
event.getX(), event.getY()); event.getX(), event.getY());
} }
if (!isFromPrimePointer(event, false)) {
return true;
}
final int action = event.getActionMasked(); final int action = event.getActionMasked();
if (mEditor != null) { if (mEditor != null) {
if (!isFromPrimePointer(event, false)) {
return true;
}
mEditor.onTouchEvent(event); mEditor.onTouchEvent(event);
if (mEditor.mInsertionPointCursorController != null if (mEditor.mInsertionPointCursorController != null