summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOwen Lin <owenlin@google.com>2012-07-11 11:20:00 +0800
committerOwen Lin <owenlin@google.com>2012-07-17 17:43:36 +0800
commitc909dd6ff9c4a9492040f654f94a7894b44bbd53 (patch)
tree23e3ba12a63e461bd9912b3a1c7f5c20cfb8a3de
parent7f4ced6e601634b0d19c635393f19671ebd61a6e (diff)
downloadandroid_packages_apps_Snap-c909dd6ff9c4a9492040f654f94a7894b44bbd53.tar.gz
android_packages_apps_Snap-c909dd6ff9c4a9492040f654f94a7894b44bbd53.tar.bz2
android_packages_apps_Snap-c909dd6ff9c4a9492040f654f94a7894b44bbd53.zip
Make CustomMenu compatible with API level 10.
bug: 6802855 Change-Id: I230c91bd9744935a181881131dcd2275ed89d819
-rw-r--r--res/drawable-hdpi/menu_dropdown_panel_holo_dark.9.pngbin0 -> 922 bytes
-rw-r--r--res/drawable-mdpi/menu_dropdown_panel_holo_dark.9.pngbin0 -> 651 bytes
-rw-r--r--res/drawable-xhdpi/menu_dropdown_panel_holo_dark.9.pngbin0 -> 1362 bytes
-rw-r--r--res/layout/popup_list_item.xml (renamed from res/menu/selection.xml)17
-rw-r--r--res/values/ids.xml1
5 files changed, 14 insertions, 4 deletions
diff --git a/res/drawable-hdpi/menu_dropdown_panel_holo_dark.9.png b/res/drawable-hdpi/menu_dropdown_panel_holo_dark.9.png
new file mode 100644
index 000000000..4d3d20857
--- /dev/null
+++ b/res/drawable-hdpi/menu_dropdown_panel_holo_dark.9.png
Binary files differ
diff --git a/res/drawable-mdpi/menu_dropdown_panel_holo_dark.9.png b/res/drawable-mdpi/menu_dropdown_panel_holo_dark.9.png
new file mode 100644
index 000000000..460ec46eb
--- /dev/null
+++ b/res/drawable-mdpi/menu_dropdown_panel_holo_dark.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/menu_dropdown_panel_holo_dark.9.png b/res/drawable-xhdpi/menu_dropdown_panel_holo_dark.9.png
new file mode 100644
index 000000000..e2aff72f4
--- /dev/null
+++ b/res/drawable-xhdpi/menu_dropdown_panel_holo_dark.9.png
Binary files differ
diff --git a/res/menu/selection.xml b/res/layout/popup_list_item.xml
index 18839e4d2..4dbc610d9 100644
--- a/res/menu/selection.xml
+++ b/res/layout/popup_list_item.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 Google Inc.
+<!-- Copyright (C) 2012 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -13,6 +13,15 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:id="@+id/action_select_all" android:title="@string/select_all" />
-</menu>
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@android:id/text1"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceListItemSmall"
+ android:gravity="center_vertical"
+ android:paddingLeft="16dp"
+ android:paddingRight="16dp"
+ android:minHeight="?android:attr/listPreferredItemHeightSmall"
+ android:minWidth="196dp"
+/>
diff --git a/res/values/ids.xml b/res/values/ids.xml
index b6fda4771..7babba067 100644
--- a/res/values/ids.xml
+++ b/res/values/ids.xml
@@ -18,4 +18,5 @@
-->
<resources>
<item type="id" name="action_toggle_full_caching" />
+ <item type="id" name="action_select_all" />
</resources>