diff options
author | Justin Ho <justinho@google.com> | 2011-03-17 16:49:32 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-17 16:49:32 -0700 |
commit | 5dbd0978cd7f2d3ff1e28bbfdef2f757de28e1bc (patch) | |
tree | 72a4196dbc5030c50a4696635b41ca255289be6e /core/res | |
parent | be368de7b7614e89bae8fb59ea4283eba890a2c1 (diff) | |
parent | 33cb33d7de1163e507df416b0ff0d2ae5b52d77b (diff) | |
download | frameworks_base-5dbd0978cd7f2d3ff1e28bbfdef2f757de28e1bc.zip frameworks_base-5dbd0978cd7f2d3ff1e28bbfdef2f757de28e1bc.tar.gz frameworks_base-5dbd0978cd7f2d3ff1e28bbfdef2f757de28e1bc.tar.bz2 |
Merge "Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF" into honeycomb-mr1
Diffstat (limited to 'core/res')
-rw-r--r-- | core/res/res/drawable-hdpi/ic_menu_copy_dark.png | bin | 479 -> 0 bytes | |||
-rw-r--r-- | core/res/res/drawable-hdpi/ic_menu_copy_light.png | bin | 578 -> 0 bytes | |||
-rw-r--r-- | core/res/res/drawable-hdpi/ic_menu_cut_dark.png | bin | 1006 -> 0 bytes | |||
-rw-r--r-- | core/res/res/drawable-hdpi/ic_menu_cut_light.png | bin | 1493 -> 0 bytes | |||
-rw-r--r-- | core/res/res/drawable-hdpi/ic_menu_paste_dark.png | bin | 709 -> 0 bytes | |||
-rw-r--r-- | core/res/res/drawable-hdpi/ic_menu_paste_light.png | bin | 945 -> 0 bytes | |||
-rw-r--r-- | core/res/res/drawable-mdpi/ic_menu_copy_dark.png | bin | 472 -> 0 bytes | |||
-rw-r--r-- | core/res/res/drawable-mdpi/ic_menu_copy_light.png | bin | 542 -> 0 bytes | |||
-rw-r--r-- | core/res/res/drawable-mdpi/ic_menu_cut_dark.png | bin | 727 -> 0 bytes | |||
-rw-r--r-- | core/res/res/drawable-mdpi/ic_menu_cut_light.png | bin | 1006 -> 0 bytes | |||
-rw-r--r-- | core/res/res/drawable-mdpi/ic_menu_paste_dark.png | bin | 586 -> 0 bytes | |||
-rw-r--r-- | core/res/res/drawable-mdpi/ic_menu_paste_light.png | bin | 726 -> 0 bytes | |||
-rw-r--r-- | core/res/res/values/arrays.xml | 12 | ||||
-rw-r--r-- | core/res/res/values/themes.xml | 16 |
14 files changed, 14 insertions, 14 deletions
diff --git a/core/res/res/drawable-hdpi/ic_menu_copy_dark.png b/core/res/res/drawable-hdpi/ic_menu_copy_dark.png Binary files differdeleted file mode 100644 index 852f146..0000000 --- a/core/res/res/drawable-hdpi/ic_menu_copy_dark.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/ic_menu_copy_light.png b/core/res/res/drawable-hdpi/ic_menu_copy_light.png Binary files differdeleted file mode 100644 index ad09b37..0000000 --- a/core/res/res/drawable-hdpi/ic_menu_copy_light.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/ic_menu_cut_dark.png b/core/res/res/drawable-hdpi/ic_menu_cut_dark.png Binary files differdeleted file mode 100644 index 7716a94..0000000 --- a/core/res/res/drawable-hdpi/ic_menu_cut_dark.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/ic_menu_cut_light.png b/core/res/res/drawable-hdpi/ic_menu_cut_light.png Binary files differdeleted file mode 100644 index bea6db1..0000000 --- a/core/res/res/drawable-hdpi/ic_menu_cut_light.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/ic_menu_paste_dark.png b/core/res/res/drawable-hdpi/ic_menu_paste_dark.png Binary files differdeleted file mode 100644 index 5579443..0000000 --- a/core/res/res/drawable-hdpi/ic_menu_paste_dark.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/ic_menu_paste_light.png b/core/res/res/drawable-hdpi/ic_menu_paste_light.png Binary files differdeleted file mode 100644 index 6674914..0000000 --- a/core/res/res/drawable-hdpi/ic_menu_paste_light.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/ic_menu_copy_dark.png b/core/res/res/drawable-mdpi/ic_menu_copy_dark.png Binary files differdeleted file mode 100644 index 35c3318..0000000 --- a/core/res/res/drawable-mdpi/ic_menu_copy_dark.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/ic_menu_copy_light.png b/core/res/res/drawable-mdpi/ic_menu_copy_light.png Binary files differdeleted file mode 100644 index 3b179d8..0000000 --- a/core/res/res/drawable-mdpi/ic_menu_copy_light.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/ic_menu_cut_dark.png b/core/res/res/drawable-mdpi/ic_menu_cut_dark.png Binary files differdeleted file mode 100644 index dfe8b4a..0000000 --- a/core/res/res/drawable-mdpi/ic_menu_cut_dark.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/ic_menu_cut_light.png b/core/res/res/drawable-mdpi/ic_menu_cut_light.png Binary files differdeleted file mode 100644 index 748dc9b..0000000 --- a/core/res/res/drawable-mdpi/ic_menu_cut_light.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/ic_menu_paste_dark.png b/core/res/res/drawable-mdpi/ic_menu_paste_dark.png Binary files differdeleted file mode 100644 index caec299..0000000 --- a/core/res/res/drawable-mdpi/ic_menu_paste_dark.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/ic_menu_paste_light.png b/core/res/res/drawable-mdpi/ic_menu_paste_light.png Binary files differdeleted file mode 100644 index 434f5d1..0000000 --- a/core/res/res/drawable-mdpi/ic_menu_paste_light.png +++ /dev/null diff --git a/core/res/res/values/arrays.xml b/core/res/res/values/arrays.xml index fa33b0a..9073531 100644 --- a/core/res/res/values/arrays.xml +++ b/core/res/res/values/arrays.xml @@ -242,15 +242,15 @@ <item>@drawable/action_bar_background</item> <item>@drawable/action_bar_divider</item> <item>@drawable/ic_menu_close_clear_cancel</item> - <item>@drawable/ic_menu_copy_dark</item> - <item>@drawable/ic_menu_copy_light</item> - <item>@drawable/ic_menu_cut_dark</item> - <item>@drawable/ic_menu_cut_light</item> + <item>@drawable/ic_menu_copy_holo_dark</item> + <item>@drawable/ic_menu_copy_holo_light</item> + <item>@drawable/ic_menu_cut_holo_dark</item> + <item>@drawable/ic_menu_cut_holo_light</item> <item>@drawable/ic_menu_more</item> <item>@drawable/ic_menu_moreoverflow_holo_dark</item> <item>@drawable/ic_menu_moreoverflow_holo_light</item> - <item>@drawable/ic_menu_paste_dark</item> - <item>@drawable/ic_menu_paste_light</item> + <item>@drawable/ic_menu_paste_holo_dark</item> + <item>@drawable/ic_menu_paste_holo_light</item> <item>@drawable/dialog_bottom_holo_dark</item> <item>@drawable/dialog_bottom_holo_light</item> <item>@drawable/dialog_full_holo_dark</item> diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml index 5f4ea32..b127747 100644 --- a/core/res/res/values/themes.xml +++ b/core/res/res/values/themes.xml @@ -260,11 +260,11 @@ <item name="actionOverflowButtonStyle">@android:style/Widget.ActionButton.Overflow</item> <item name="actionModeBackground">@android:drawable/cab_background_dark</item> <item name="actionModeCloseDrawable">@android:drawable/ic_menu_close_clear_cancel</item> - <item name="actionModeCutDrawable">@android:drawable/ic_menu_cut_dark</item> - <item name="actionModeCopyDrawable">@android:drawable/ic_menu_copy_dark</item> - <item name="actionModePasteDrawable">@android:drawable/ic_menu_paste_dark</item> - <item name="actionModeShareDrawable">@android:drawable/ic_menu_share</item> - <item name="actionModeFindDrawable">@android:drawable/ic_menu_find</item> + <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="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> <item name="actionBarTabStyle">@style/Widget.ActionBarView_TabView</item> <item name="actionBarTabBarStyle">@style/Widget.ActionBarView_TabBar</item> @@ -385,9 +385,9 @@ <item name="progressBarStyleInverse">@android:style/Widget.ProgressBar</item> <item name="progressBarStyleSmallInverse">@android:style/Widget.ProgressBar.Small</item> <item name="progressBarStyleLargeInverse">@android:style/Widget.ProgressBar.Large</item> - <item name="actionModeCutDrawable">@android:drawable/ic_menu_cut_light</item> - <item name="actionModeCopyDrawable">@android:drawable/ic_menu_copy_light</item> - <item name="actionModePasteDrawable">@android:drawable/ic_menu_paste_light</item> + <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="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> |