Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 088e1712 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Do not invoke textclassifier when dimissing the selection""... 

Merge "Revert "Do not invoke textclassifier when dimissing the selection"" into sc-dev am: 2fdb6bd7 am: b9f59a5a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14519405

Change-Id: Ib1552fe13a3bb92a8e44a97a6cef2ac87b2dc29d
parents 46ecb803 b9f59a5a

core/java/android/widget/Editor.java

+8 −16
Original line number Diff line number Diff line
@@ -1725,21 +1725,13 @@ public class Editor { 
    }



    private void updateFloatingToolbarVisibility(MotionEvent event) {

        if (mTextActionMode == null) {

            return;

        }

        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:

                final SelectionModifierCursorController selectionController =

                        getSelectionController();

                final InsertionPointCursorController insertionController = getInsertionController();

                if ((selectionController != null && selectionController.isCursorBeingModified())

                        || (insertionController != null

                        && insertionController.isCursorBeingModified())) {

                    showFloatingToolbar();

            }

        }