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

Commit bb74d8b9 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 783fe429: am e305e5f6: Merge "show SELECT ALL icon with text in landscape mode" 

# By Sungmin Choi
# Via Android Git Automerger (1) and others
* commit '783fe429':
  show SELECT ALL icon with text in landscape mode
parents c28fde57 783fe429

core/java/android/widget/Editor.java

+2 −11
Original line number Diff line number Diff line
@@ -2696,23 +2696,14 @@ public class Editor { 
            TypedArray styledAttributes = mTextView.getContext().obtainStyledAttributes(

                    com.android.internal.R.styleable.SelectionModeDrawables);



            boolean allowText = mTextView.getContext().getResources().getBoolean(

                    com.android.internal.R.bool.config_allowActionMenuItemTextWithIcon);



            mode.setTitle(mTextView.getContext().getString(

                    com.android.internal.R.string.textSelectionCABTitle));

            mode.setSubtitle(null);

            mode.setTitleOptionalHint(true);



            int selectAllIconId = 0; // No icon by default

            if (!allowText) {

                // Provide an icon, text will not be displayed on smaller screens.

                selectAllIconId = styledAttributes.getResourceId(

                        R.styleable.SelectionModeDrawables_actionModeSelectAllDrawable, 0);

            }



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

                    setIcon(selectAllIconId).

                    setIcon(styledAttributes.getResourceId(

                            R.styleable.SelectionModeDrawables_actionModeSelectAllDrawable, 0)).

                    setAlphabeticShortcut('a').

                    setShowAsAction(

                            MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);