diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/widget/TextView.java | 14 | ||||
| -rw-r--r-- | core/res/res/drawable-hdpi/ic_menu_selectall_holo_dark.png | bin | 0 -> 709 bytes | |||
| -rw-r--r-- | core/res/res/drawable-hdpi/ic_menu_selectall_holo_light.png | bin | 0 -> 945 bytes | |||
| -rw-r--r-- | core/res/res/drawable-mdpi/ic_menu_selectall_holo_dark.png | bin | 0 -> 586 bytes | |||
| -rw-r--r-- | core/res/res/drawable-mdpi/ic_menu_selectall_holo_light.png | bin | 0 -> 726 bytes | |||
| -rwxr-xr-x | core/res/res/values/attrs.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 1 | ||||
| -rw-r--r-- | core/res/res/values/themes.xml | 4 |
9 files changed, 21 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index a621508c22c3..932c551157f1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -201,6 +201,7 @@ package android { field public static final int actionModeCopyDrawable = 16843538; // 0x1010312 field public static final int actionModeCutDrawable = 16843537; // 0x1010311 field public static final int actionModePasteDrawable = 16843539; // 0x1010313 + field public static final int actionModeSelectAllDrawable = 16843641; // 0x1010379 field public static final int actionOverflowButtonStyle = 16843510; // 0x10102f6 field public static final int actionViewClass = 16843516; // 0x10102fc field public static final int activatedBackgroundIndicator = 16843517; // 0x10102fd diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 18c3b24e9062..5886c64ecbb7 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -8787,10 +8787,22 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener public boolean onCreateActionMode(ActionMode mode, Menu menu) { TypedArray styledAttributes = mContext.obtainStyledAttributes(R.styleable.Theme); - mode.setTitle(mContext.getString(com.android.internal.R.string.textSelectionCABTitle)); + boolean allowText = getContext().getResources().getBoolean( + com.android.internal.R.bool.allow_action_menu_item_text_with_icon); + + mode.setTitle(allowText ? + mContext.getString(com.android.internal.R.string.textSelectionCABTitle) : null); mode.setSubtitle(null); + 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.Theme_actionModeSelectAllDrawable, 0); + } + menu.add(0, ID_SELECT_ALL, 0, com.android.internal.R.string.selectAll). + setIcon(selectAllIconId). setAlphabeticShortcut('a'). setShowAsAction( MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT); diff --git a/core/res/res/drawable-hdpi/ic_menu_selectall_holo_dark.png b/core/res/res/drawable-hdpi/ic_menu_selectall_holo_dark.png Binary files differnew file mode 100644 index 000000000000..5579443710b2 --- /dev/null +++ b/core/res/res/drawable-hdpi/ic_menu_selectall_holo_dark.png diff --git a/core/res/res/drawable-hdpi/ic_menu_selectall_holo_light.png b/core/res/res/drawable-hdpi/ic_menu_selectall_holo_light.png Binary files differnew file mode 100644 index 000000000000..667491475d2d --- /dev/null +++ b/core/res/res/drawable-hdpi/ic_menu_selectall_holo_light.png diff --git a/core/res/res/drawable-mdpi/ic_menu_selectall_holo_dark.png b/core/res/res/drawable-mdpi/ic_menu_selectall_holo_dark.png Binary files differnew file mode 100644 index 000000000000..caec299c39f6 --- /dev/null +++ b/core/res/res/drawable-mdpi/ic_menu_selectall_holo_dark.png diff --git a/core/res/res/drawable-mdpi/ic_menu_selectall_holo_light.png b/core/res/res/drawable-mdpi/ic_menu_selectall_holo_light.png Binary files differnew file mode 100644 index 000000000000..434f5d1bcc2d --- /dev/null +++ b/core/res/res/drawable-mdpi/ic_menu_selectall_holo_light.png diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index e325b8d770e8..db7621158a59 100755 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -619,6 +619,8 @@ <attr name="actionModeCopyDrawable" format="reference" /> <!-- Drawable to use for the Paste action button in Contextual Action Bar --> <attr name="actionModePasteDrawable" format="reference" /> + <!-- Drawable to use for the Select all action button in Contextual Action Bar --> + <attr name="actionModeSelectAllDrawable" format="reference" /> <!-- Drawable to use for the Share action button in WebView selection action modes --> <attr name="actionModeShareDrawable" format="reference" /> <!-- Drawable to use for the Find action button in WebView selection action modes --> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 41a566c61901..4c3cfc117ea6 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -1684,6 +1684,7 @@ <public type="attr" name="layout_rowWeight" /> <public type="attr" name="layout_columnSpan" /> <public type="attr" name="layout_columnWeight" /> + <public type="attr" name="actionModeSelectAllDrawable" /> <public type="attr" name="isAuxiliary" /> diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml index 0a614b2dd0b9..4f39da429bd2 100644 --- a/core/res/res/values/themes.xml +++ b/core/res/res/values/themes.xml @@ -267,6 +267,7 @@ <item name="actionModeCutDrawable">@android:drawable/ic_menu_cut_holo_dark</item> <item name="actionModeCopyDrawable">@android:drawable/ic_menu_copy_holo_dark</item> <item name="actionModePasteDrawable">@android:drawable/ic_menu_paste_holo_dark</item> + <item name="actionModeSelectAllDrawable">@android:drawable/ic_menu_selectall_holo_dark</item> <item name="actionModeShareDrawable">@android:drawable/ic_menu_share_holo_dark</item> <item name="actionModeFindDrawable">@android:drawable/ic_menu_find_holo_dark</item> <item name="actionModeWebSearchDrawable">@android:drawable/ic_menu_search</item> @@ -396,6 +397,7 @@ <item name="actionModeCutDrawable">@android:drawable/ic_menu_cut_holo_light</item> <item name="actionModeCopyDrawable">@android:drawable/ic_menu_copy_holo_light</item> <item name="actionModePasteDrawable">@android:drawable/ic_menu_paste_holo_light</item> + <item name="actionModeSelectAllDrawable">@android:drawable/ic_menu_selectall_holo_light</item> <item name="actionModeShareDrawable">@android:drawable/ic_menu_share_holo_light</item> <item name="actionModeFindDrawable">@android:drawable/ic_menu_find_holo_light</item> <item name="actionModeWebSearchDrawable">@android:drawable/ic_menu_search_holo_light</item> @@ -1029,6 +1031,7 @@ <item name="actionModeCutDrawable">@android:drawable/ic_menu_cut_holo_dark</item> <item name="actionModeCopyDrawable">@android:drawable/ic_menu_copy_holo_dark</item> <item name="actionModePasteDrawable">@android:drawable/ic_menu_paste_holo_dark</item> + <item name="actionModeSelectAllDrawable">@android:drawable/ic_menu_selectall_holo_dark</item> <item name="actionModeShareDrawable">@android:drawable/ic_menu_share_holo_dark</item> <item name="actionModeFindDrawable">@android:drawable/ic_menu_find_holo_dark</item> <item name="actionModeWebSearchDrawable">@android:drawable/ic_menu_search_holo_dark</item> @@ -1316,6 +1319,7 @@ <item name="actionModeCutDrawable">@android:drawable/ic_menu_cut_holo_light</item> <item name="actionModeCopyDrawable">@android:drawable/ic_menu_copy_holo_light</item> <item name="actionModePasteDrawable">@android:drawable/ic_menu_paste_holo_light</item> + <item name="actionModeSelectAllDrawable">@android:drawable/ic_menu_selectall_holo_light</item> <item name="actionModeShareDrawable">@android:drawable/ic_menu_share_holo_light</item> <item name="actionModeFindDrawable">@android:drawable/ic_menu_find_holo_light</item> <item name="actionModeWebSearchDrawable">@android:drawable/ic_menu_search_holo_light</item> |
