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

Commit 32b7f9fb authored by Clara Bayarri's avatar Clara Bayarri Committed by Android (Google) Code Review
Browse files

Merge "Editor: Turn on Floating Toolbar Action Mode for Text Selection"

parents d954fbb9 b8ed5b75

core/java/android/widget/Editor.java

+4 −2
Original line number Diff line number Diff line
@@ -1671,7 +1671,8 @@ public class Editor { 
            return false;

        }

        ActionMode.Callback actionModeCallback = new SelectionActionModeCallback();

        mSelectionActionMode = mTextView.startActionMode(actionModeCallback);

        mSelectionActionMode = mTextView.startActionMode(

                actionModeCallback, ActionMode.TYPE_FLOATING);

        return mSelectionActionMode != null;

    }
@@ -1704,7 +1705,8 @@ public class Editor { 
        // immediately hide the newly created action bar and would be visually distracting.

        if (!willExtract) {

            ActionMode.Callback actionModeCallback = new SelectionActionModeCallback();

            mSelectionActionMode = mTextView.startActionMode(actionModeCallback);

            mSelectionActionMode = mTextView.startActionMode(

                    actionModeCallback, ActionMode.TYPE_FLOATING);

        }



        final boolean selectionStarted = mSelectionActionMode != null || willExtract;