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

Merge "Fix double-tap detection in TextView's SelectionModifierCursorController" into rvc-dev

Browse Source
This commit is contained in:
Nikita Dubrovsky
2020-06-23 18:59:38 +00:00
committed by Android (Google) Code Review
parent 6fcac665ac e97b0ecadc
commit 2d4921d1f5
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6354,6 +6354,8 @@ public class Editor {
// The offsets of that last touch down event. Remembered to start selection there.
private int mMinTouchOffset, mMaxTouchOffset;
private boolean mGestureStayedInTapRegion;
// Where the user first starts the drag motion.
private int mStartOffset = -1;
@@ -6460,8 +6462,10 @@ public class Editor {
eventX, eventY);
// Double tap detection
if (mTouchState.isMultiTapInSameArea() && (isMouse
|| mTouchState.isOnHandle() || isPositionOnText(eventX, eventY))) {
if (mGestureStayedInTapRegion
&& mTouchState.isMultiTapInSameArea()
&& (isMouse || isPositionOnText(eventX, eventY)
|| mTouchState.isOnHandle())) {
if (TextView.DEBUG_CURSOR) {
logCursor("SelectionModifierCursorController: onTouchEvent",
"ACTION_DOWN: select and start drag");
@@ -6473,6 +6477,7 @@ public class Editor {
}
mDiscardNextActionUp = true;
}
mGestureStayedInTapRegion = true;
mHaventMovedEnoughToStartDrag = true;
}
break;
@@ -6488,6 +6493,14 @@ public class Editor {
break;
case MotionEvent.ACTION_MOVE:
if (mGestureStayedInTapRegion) {
final ViewConfiguration viewConfig = ViewConfiguration.get(
mTextView.getContext());
mGestureStayedInTapRegion = EditorTouchState.isDistanceWithin(
mTouchState.getLastDownX(), mTouchState.getLastDownY(),
eventX, eventY, viewConfig.getScaledDoubleTapTouchSlop());
}
if (mHaventMovedEnoughToStartDrag) {
mHaventMovedEnoughToStartDrag = !mTouchState.isMovedEnoughForDrag();
}