diff options
| author | Adam Powell <adamp@android.com> | 2013-01-28 18:44:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-01-28 18:44:10 +0000 |
| commit | e305e5f68df8338cb3c4bdcf099d23ec9abce564 (patch) | |
| tree | 8901b896b4a6ece2b380e22593ebc1bc89f4821c | |
| parent | 3cfca67b0f1e3f464274fa5d3b2e31e5288d8f38 (diff) | |
| parent | f036920669f933c05ac43a8e0ea6cb1a4e35275a (diff) | |
| download | frameworks_base-e305e5f68df8338cb3c4bdcf099d23ec9abce564.zip frameworks_base-e305e5f68df8338cb3c4bdcf099d23ec9abce564.tar.gz frameworks_base-e305e5f68df8338cb3c4bdcf099d23ec9abce564.tar.bz2 | |
Merge "show SELECT ALL icon with text in landscape mode"
| -rw-r--r-- | core/java/android/widget/Editor.java | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java index b1a44c5..4a7426b 100644 --- a/core/java/android/widget/Editor.java +++ b/core/java/android/widget/Editor.java @@ -2659,23 +2659,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); |