diff options
| -rw-r--r-- | core/java/android/widget/Editor.java | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java index 444736160f0f..0c4da88bb058 100644 --- a/core/java/android/widget/Editor.java +++ b/core/java/android/widget/Editor.java @@ -1725,23 +1725,15 @@ public class Editor { } private void updateFloatingToolbarVisibility(MotionEvent event) { - if (mTextActionMode == null) { - return; - } - switch (event.getActionMasked()) { - case MotionEvent.ACTION_MOVE: - hideFloatingToolbar(ActionMode.DEFAULT_HIDE_DURATION); - break; - 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())) { + if (mTextActionMode != null) { + switch (event.getActionMasked()) { + case MotionEvent.ACTION_MOVE: + hideFloatingToolbar(ActionMode.DEFAULT_HIDE_DURATION); + break; + case MotionEvent.ACTION_UP: // fall through + case MotionEvent.ACTION_CANCEL: showFloatingToolbar(); - } + } } } |