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

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

Merge "Editor: Reorder items in the text selection action mode."

parents cea28353 ed2e3914

core/java/android/widget/Editor.java

+7 −7
Original line number Diff line number Diff line
@@ -2956,13 +2956,6 @@ public class Editor { 
            mode.setSubtitle(null);

            mode.setTitleOptionalHint(true);



            menu.add(0, TextView.ID_SELECT_ALL, 0, com.android.internal.R.string.selectAll).

                    setIcon(styledAttributes.getResourceId(

                            R.styleable.SelectionModeDrawables_actionModeSelectAllDrawable, 0)).

                    setAlphabeticShortcut('a').

                    setShowAsAction(

                            MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);



            if (mTextView.canCut()) {

                menu.add(0, TextView.ID_CUT, 0, com.android.internal.R.string.cut).

                    setIcon(styledAttributes.getResourceId(
@@ -2990,6 +2983,13 @@ public class Editor { 
                                MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);

            }



            menu.add(0, TextView.ID_SELECT_ALL, 0, com.android.internal.R.string.selectAll).

                    setIcon(styledAttributes.getResourceId(

                            R.styleable.SelectionModeDrawables_actionModeSelectAllDrawable, 0)).

                    setAlphabeticShortcut('a').

                    setShowAsAction(

                            MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);



            if (mTextView.isSuggestionsEnabled() && isCursorInsideSuggestionSpan()) {

                menu.add(0, TextView.ID_REPLACE, 0, com.android.internal.R.string.replace).

                        setShowAsAction(