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

Merge "Scribe in View: disable cursor drag when handwriting is enabled" into tm-dev

Browse Source
This commit is contained in:
Haoyu Zhang
2022-03-21 20:11:46 +00:00
committed by Android (Google) Code Review
parent 6cd9dd1956 b989691d71
commit b3c1d1984e
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6309,7 +6309,8 @@ public class Editor {
} }
switch (event.getActionMasked()) { switch (event.getActionMasked()) {
case MotionEvent.ACTION_MOVE: case MotionEvent.ACTION_MOVE:
if (event.isFromSource(InputDevice.SOURCE_MOUSE)) { if (event.isFromSource(InputDevice.SOURCE_MOUSE)
|| (mTextView.isAutoHandwritingEnabled() && isFromStylus(event))) {
break; break;
} }
if (mIsDraggingCursor) { if (mIsDraggingCursor) {
@@ -6332,6 +6333,11 @@ public class Editor {
} }
} }
private boolean isFromStylus(MotionEvent motionEvent) {
final int pointerIndex = motionEvent.getActionIndex();
return motionEvent.getToolType(pointerIndex) == MotionEvent.TOOL_TYPE_STYLUS;
}
private void positionCursorDuringDrag(MotionEvent event) { private void positionCursorDuringDrag(MotionEvent event) {
mPrevLineDuringDrag = getLineDuringDrag(event); mPrevLineDuringDrag = getLineDuringDrag(event);
int offset = mTextView.getOffsetAtCoordinate(mPrevLineDuringDrag, event.getX()); int offset = mTextView.getOffsetAtCoordinate(mPrevLineDuringDrag, event.getX());