Merge "Makes the multi-touch prevention only works for editable TextView." into rvc-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
b72c8a096b
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user