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

Merge "Revert "Do not invoke textclassifier when dimissing the selection"" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-24 11:48:28 +00:00
committed by Android (Google) Code Review
parent 4b5aa29c5c c103424e3a
commit 2fdb6bd709
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1725,23 +1725,15 @@ public class Editor {
} }
private void updateFloatingToolbarVisibility(MotionEvent event) { private void updateFloatingToolbarVisibility(MotionEvent event) {
if (mTextActionMode == null) { if (mTextActionMode != null) {
return; switch (event.getActionMasked()) {
} case MotionEvent.ACTION_MOVE:
switch (event.getActionMasked()) { hideFloatingToolbar(ActionMode.DEFAULT_HIDE_DURATION);
case MotionEvent.ACTION_MOVE: break;
hideFloatingToolbar(ActionMode.DEFAULT_HIDE_DURATION); case MotionEvent.ACTION_UP: // fall through
break; case MotionEvent.ACTION_CANCEL:
case MotionEvent.ACTION_UP: // fall through
case MotionEvent.ACTION_CANCEL:
final SelectionModifierCursorController selectionController =
getSelectionController();
final InsertionPointCursorController insertionController = getInsertionController();
if ((selectionController != null && selectionController.isCursorBeingModified())
|| (insertionController != null
&& insertionController.isCursorBeingModified())) {
showFloatingToolbar(); showFloatingToolbar();
} }
} }
} }