diff --git a/core/java/android/app/AlertDialog.java b/core/java/android/app/AlertDialog.java
index dc87aeb6353f0..4a629bbecf204 100644
--- a/core/java/android/app/AlertDialog.java
+++ b/core/java/android/app/AlertDialog.java
@@ -78,7 +78,6 @@ public class AlertDialog extends Dialog implements DialogInterface {
TypedValue outValue = new TypedValue();
context.getTheme().resolveAttribute(com.android.internal.R.attr.alertDialogTheme,
outValue, true);
- Log.d("AlertDialog", "getDefaultDialogTheme data " + outValue.data + " id " + outValue.resourceId);
return outValue.resourceId;
}
diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java
index 054423ccc09f2..4c3bba1e09895 100644
--- a/core/java/com/android/internal/widget/ActionBarView.java
+++ b/core/java/com/android/internal/widget/ActionBarView.java
@@ -351,7 +351,7 @@ public class ActionBarView extends ViewGroup {
break;
case ActionBar.NAVIGATION_MODE_DROPDOWN_LIST:
mSpinner = new Spinner(mContext, null,
- com.android.internal.R.attr.dropDownSpinnerStyle);
+ com.android.internal.R.attr.actionDropDownStyle);
mSpinner.setOnItemSelectedListener(mNavItemSelectedListener);
addView(mSpinner);
break;
diff --git a/core/res/res/drawable-hdpi/spinner_active_holo_dark.9.png b/core/res/res/drawable-hdpi/spinner_active_holo_dark.9.png
new file mode 100644
index 0000000000000..bbf28615b2744
Binary files /dev/null and b/core/res/res/drawable-hdpi/spinner_active_holo_dark.9.png differ
diff --git a/core/res/res/drawable-hdpi/spinner_active_holo_light.9.png b/core/res/res/drawable-hdpi/spinner_active_holo_light.9.png
new file mode 100644
index 0000000000000..a10098df8b922
Binary files /dev/null and b/core/res/res/drawable-hdpi/spinner_active_holo_light.9.png differ
diff --git a/core/res/res/drawable-hdpi/spinner_cab_active_holo_dark.9.png b/core/res/res/drawable-hdpi/spinner_cab_active_holo_dark.9.png
new file mode 100644
index 0000000000000..ffae7e7251b14
Binary files /dev/null and b/core/res/res/drawable-hdpi/spinner_cab_active_holo_dark.9.png differ
diff --git a/core/res/res/drawable-hdpi/spinner_cab_active_holo_light.9.png b/core/res/res/drawable-hdpi/spinner_cab_active_holo_light.9.png
new file mode 100644
index 0000000000000..eaa38e241eb2c
Binary files /dev/null and b/core/res/res/drawable-hdpi/spinner_cab_active_holo_light.9.png differ
diff --git a/core/res/res/drawable-hdpi/spinner_cab_default_holo_dark.9.png b/core/res/res/drawable-hdpi/spinner_cab_default_holo_dark.9.png
new file mode 100644
index 0000000000000..869371095b37e
Binary files /dev/null and b/core/res/res/drawable-hdpi/spinner_cab_default_holo_dark.9.png differ
diff --git a/core/res/res/drawable-hdpi/spinner_cab_default_holo_light.9.png b/core/res/res/drawable-hdpi/spinner_cab_default_holo_light.9.png
new file mode 100644
index 0000000000000..941739e02a76e
Binary files /dev/null and b/core/res/res/drawable-hdpi/spinner_cab_default_holo_light.9.png differ
diff --git a/core/res/res/drawable-hdpi/spinner_cab_disabled_holo_dark.9.png b/core/res/res/drawable-hdpi/spinner_cab_disabled_holo_dark.9.png
new file mode 100644
index 0000000000000..e672c958e85af
Binary files /dev/null and b/core/res/res/drawable-hdpi/spinner_cab_disabled_holo_dark.9.png differ
diff --git a/core/res/res/drawable-hdpi/spinner_cab_disabled_holo_light.9.png b/core/res/res/drawable-hdpi/spinner_cab_disabled_holo_light.9.png
new file mode 100644
index 0000000000000..f4995402f7319
Binary files /dev/null and b/core/res/res/drawable-hdpi/spinner_cab_disabled_holo_light.9.png differ
diff --git a/core/res/res/drawable-hdpi/spinner_cab_focused_holo_dark.9.png b/core/res/res/drawable-hdpi/spinner_cab_focused_holo_dark.9.png
new file mode 100644
index 0000000000000..f4900a5fa8168
Binary files /dev/null and b/core/res/res/drawable-hdpi/spinner_cab_focused_holo_dark.9.png differ
diff --git a/core/res/res/drawable-hdpi/spinner_cab_focused_holo_light.9.png b/core/res/res/drawable-hdpi/spinner_cab_focused_holo_light.9.png
new file mode 100644
index 0000000000000..1286542b4adfd
Binary files /dev/null and b/core/res/res/drawable-hdpi/spinner_cab_focused_holo_light.9.png differ
diff --git a/core/res/res/drawable-hdpi/spinner_cab_pressed_holo_dark.9.png b/core/res/res/drawable-hdpi/spinner_cab_pressed_holo_dark.9.png
new file mode 100644
index 0000000000000..dc236ec71ef84
Binary files /dev/null and b/core/res/res/drawable-hdpi/spinner_cab_pressed_holo_dark.9.png differ
diff --git a/core/res/res/drawable-hdpi/spinner_cab_pressed_holo_light.9.png b/core/res/res/drawable-hdpi/spinner_cab_pressed_holo_light.9.png
new file mode 100644
index 0000000000000..17e3a27679784
Binary files /dev/null and b/core/res/res/drawable-hdpi/spinner_cab_pressed_holo_light.9.png differ
diff --git a/core/res/res/drawable-hdpi/spinner_default_holo_dark.9.png b/core/res/res/drawable-hdpi/spinner_default_holo_dark.9.png
new file mode 100644
index 0000000000000..7189c6d572686
Binary files /dev/null and b/core/res/res/drawable-hdpi/spinner_default_holo_dark.9.png differ
diff --git a/core/res/res/drawable-hdpi/spinner_default_holo_light.9.png b/core/res/res/drawable-hdpi/spinner_default_holo_light.9.png
new file mode 100644
index 0000000000000..996ef154925bc
Binary files /dev/null and b/core/res/res/drawable-hdpi/spinner_default_holo_light.9.png differ
diff --git a/core/res/res/drawable-hdpi/spinner_disabled_holo_dark.9.png b/core/res/res/drawable-hdpi/spinner_disabled_holo_dark.9.png
new file mode 100644
index 0000000000000..adde694157949
Binary files /dev/null and b/core/res/res/drawable-hdpi/spinner_disabled_holo_dark.9.png differ
diff --git a/core/res/res/drawable-hdpi/spinner_disabled_holo_light.9.png b/core/res/res/drawable-hdpi/spinner_disabled_holo_light.9.png
new file mode 100644
index 0000000000000..fdb4bdff00a23
Binary files /dev/null and b/core/res/res/drawable-hdpi/spinner_disabled_holo_light.9.png differ
diff --git a/core/res/res/drawable-hdpi/spinner_focused_holo_dark.9.png b/core/res/res/drawable-hdpi/spinner_focused_holo_dark.9.png
new file mode 100644
index 0000000000000..d40d165b71122
Binary files /dev/null and b/core/res/res/drawable-hdpi/spinner_focused_holo_dark.9.png differ
diff --git a/core/res/res/drawable-hdpi/spinner_focused_holo_light.9.png b/core/res/res/drawable-hdpi/spinner_focused_holo_light.9.png
new file mode 100644
index 0000000000000..096b977f340af
Binary files /dev/null and b/core/res/res/drawable-hdpi/spinner_focused_holo_light.9.png differ
diff --git a/core/res/res/drawable-hdpi/spinner_pressed_holo_dark.9.png b/core/res/res/drawable-hdpi/spinner_pressed_holo_dark.9.png
new file mode 100644
index 0000000000000..5428b0a3a2c6a
Binary files /dev/null and b/core/res/res/drawable-hdpi/spinner_pressed_holo_dark.9.png differ
diff --git a/core/res/res/drawable-hdpi/spinner_pressed_holo_light.9.png b/core/res/res/drawable-hdpi/spinner_pressed_holo_light.9.png
new file mode 100644
index 0000000000000..33b661b07ad12
Binary files /dev/null and b/core/res/res/drawable-hdpi/spinner_pressed_holo_light.9.png differ
diff --git a/core/res/res/drawable-mdpi/spinner_active_holo_dark.9.png b/core/res/res/drawable-mdpi/spinner_active_holo_dark.9.png
new file mode 100644
index 0000000000000..c235501537ed5
Binary files /dev/null and b/core/res/res/drawable-mdpi/spinner_active_holo_dark.9.png differ
diff --git a/core/res/res/drawable-mdpi/spinner_active_holo_light.9.png b/core/res/res/drawable-mdpi/spinner_active_holo_light.9.png
new file mode 100644
index 0000000000000..06e2bded2a9dc
Binary files /dev/null and b/core/res/res/drawable-mdpi/spinner_active_holo_light.9.png differ
diff --git a/core/res/res/drawable-mdpi/spinner_cab_active_holo_dark.9.png b/core/res/res/drawable-mdpi/spinner_cab_active_holo_dark.9.png
new file mode 100644
index 0000000000000..bb57d8d94c26d
Binary files /dev/null and b/core/res/res/drawable-mdpi/spinner_cab_active_holo_dark.9.png differ
diff --git a/core/res/res/drawable-mdpi/spinner_cab_active_holo_light.9.png b/core/res/res/drawable-mdpi/spinner_cab_active_holo_light.9.png
new file mode 100644
index 0000000000000..4e3edff5afb30
Binary files /dev/null and b/core/res/res/drawable-mdpi/spinner_cab_active_holo_light.9.png differ
diff --git a/core/res/res/drawable-mdpi/spinner_cab_default_holo_dark.9.png b/core/res/res/drawable-mdpi/spinner_cab_default_holo_dark.9.png
new file mode 100644
index 0000000000000..62d2f6efc4165
Binary files /dev/null and b/core/res/res/drawable-mdpi/spinner_cab_default_holo_dark.9.png differ
diff --git a/core/res/res/drawable-mdpi/spinner_cab_default_holo_light.9.png b/core/res/res/drawable-mdpi/spinner_cab_default_holo_light.9.png
new file mode 100644
index 0000000000000..df80aa67abbda
Binary files /dev/null and b/core/res/res/drawable-mdpi/spinner_cab_default_holo_light.9.png differ
diff --git a/core/res/res/drawable-mdpi/spinner_cab_disabled_holo_dark.9.png b/core/res/res/drawable-mdpi/spinner_cab_disabled_holo_dark.9.png
new file mode 100644
index 0000000000000..fc9c109e61dc1
Binary files /dev/null and b/core/res/res/drawable-mdpi/spinner_cab_disabled_holo_dark.9.png differ
diff --git a/core/res/res/drawable-mdpi/spinner_cab_disabled_holo_light.9.png b/core/res/res/drawable-mdpi/spinner_cab_disabled_holo_light.9.png
new file mode 100644
index 0000000000000..7fc7cc1b5c78c
Binary files /dev/null and b/core/res/res/drawable-mdpi/spinner_cab_disabled_holo_light.9.png differ
diff --git a/core/res/res/drawable-mdpi/spinner_cab_focused_holo_dark.9.png b/core/res/res/drawable-mdpi/spinner_cab_focused_holo_dark.9.png
new file mode 100644
index 0000000000000..0f49fe96e0408
Binary files /dev/null and b/core/res/res/drawable-mdpi/spinner_cab_focused_holo_dark.9.png differ
diff --git a/core/res/res/drawable-mdpi/spinner_cab_focused_holo_light.9.png b/core/res/res/drawable-mdpi/spinner_cab_focused_holo_light.9.png
new file mode 100644
index 0000000000000..032d5d3ea190a
Binary files /dev/null and b/core/res/res/drawable-mdpi/spinner_cab_focused_holo_light.9.png differ
diff --git a/core/res/res/drawable-mdpi/spinner_cab_pressed_holo_dark.9.png b/core/res/res/drawable-mdpi/spinner_cab_pressed_holo_dark.9.png
new file mode 100644
index 0000000000000..9b8a54b584230
Binary files /dev/null and b/core/res/res/drawable-mdpi/spinner_cab_pressed_holo_dark.9.png differ
diff --git a/core/res/res/drawable-mdpi/spinner_cab_pressed_holo_light.9.png b/core/res/res/drawable-mdpi/spinner_cab_pressed_holo_light.9.png
new file mode 100644
index 0000000000000..6d4fa54db4643
Binary files /dev/null and b/core/res/res/drawable-mdpi/spinner_cab_pressed_holo_light.9.png differ
diff --git a/core/res/res/drawable-mdpi/spinner_default_holo_dark.9.png b/core/res/res/drawable-mdpi/spinner_default_holo_dark.9.png
new file mode 100644
index 0000000000000..3dba235293316
Binary files /dev/null and b/core/res/res/drawable-mdpi/spinner_default_holo_dark.9.png differ
diff --git a/core/res/res/drawable-mdpi/spinner_default_holo_light.9.png b/core/res/res/drawable-mdpi/spinner_default_holo_light.9.png
new file mode 100644
index 0000000000000..4614cfa0387ed
Binary files /dev/null and b/core/res/res/drawable-mdpi/spinner_default_holo_light.9.png differ
diff --git a/core/res/res/drawable-mdpi/spinner_disabled_holo_dark.9.png b/core/res/res/drawable-mdpi/spinner_disabled_holo_dark.9.png
new file mode 100644
index 0000000000000..95d7c86e5b4f6
Binary files /dev/null and b/core/res/res/drawable-mdpi/spinner_disabled_holo_dark.9.png differ
diff --git a/core/res/res/drawable-mdpi/spinner_disabled_holo_light.9.png b/core/res/res/drawable-mdpi/spinner_disabled_holo_light.9.png
new file mode 100644
index 0000000000000..2dba2704f4934
Binary files /dev/null and b/core/res/res/drawable-mdpi/spinner_disabled_holo_light.9.png differ
diff --git a/core/res/res/drawable-mdpi/spinner_focused_holo_dark.9.png b/core/res/res/drawable-mdpi/spinner_focused_holo_dark.9.png
new file mode 100644
index 0000000000000..2e2fadd83cf92
Binary files /dev/null and b/core/res/res/drawable-mdpi/spinner_focused_holo_dark.9.png differ
diff --git a/core/res/res/drawable-mdpi/spinner_focused_holo_light.9.png b/core/res/res/drawable-mdpi/spinner_focused_holo_light.9.png
new file mode 100644
index 0000000000000..5bbbf63953db1
Binary files /dev/null and b/core/res/res/drawable-mdpi/spinner_focused_holo_light.9.png differ
diff --git a/core/res/res/drawable-mdpi/spinner_pressed_holo_dark.9.png b/core/res/res/drawable-mdpi/spinner_pressed_holo_dark.9.png
new file mode 100644
index 0000000000000..25aaed2d0159e
Binary files /dev/null and b/core/res/res/drawable-mdpi/spinner_pressed_holo_dark.9.png differ
diff --git a/core/res/res/drawable-mdpi/spinner_pressed_holo_light.9.png b/core/res/res/drawable-mdpi/spinner_pressed_holo_light.9.png
new file mode 100644
index 0000000000000..29cbc4621542f
Binary files /dev/null and b/core/res/res/drawable-mdpi/spinner_pressed_holo_light.9.png differ
diff --git a/core/res/res/drawable/spinner_background_holo_dark.xml b/core/res/res/drawable/spinner_background_holo_dark.xml
new file mode 100644
index 0000000000000..eb6b18b516ccb
--- /dev/null
+++ b/core/res/res/drawable/spinner_background_holo_dark.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
diff --git a/core/res/res/drawable/spinner_background_holo_light.xml b/core/res/res/drawable/spinner_background_holo_light.xml
new file mode 100644
index 0000000000000..9d17ed0c9bb41
--- /dev/null
+++ b/core/res/res/drawable/spinner_background_holo_light.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
diff --git a/core/res/res/drawable/spinner_cab_background_holo_dark.xml b/core/res/res/drawable/spinner_cab_background_holo_dark.xml
new file mode 100644
index 0000000000000..5572450a54073
--- /dev/null
+++ b/core/res/res/drawable/spinner_cab_background_holo_dark.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
diff --git a/core/res/res/drawable/spinner_cab_background_holo_light.xml b/core/res/res/drawable/spinner_cab_background_holo_light.xml
new file mode 100644
index 0000000000000..98ff48d00f03b
--- /dev/null
+++ b/core/res/res/drawable/spinner_cab_background_holo_light.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
diff --git a/core/res/res/layout/action_menu_item_layout.xml b/core/res/res/layout/action_menu_item_layout.xml
index 5e89f52ff0ce9..1f3117ba92a71 100644
--- a/core/res/res/layout/action_menu_item_layout.xml
+++ b/core/res/res/layout/action_menu_item_layout.xml
@@ -17,7 +17,11 @@
+ android:layout_gravity="center"
+ android:minWidth="64dip"
+ android:minHeight="?attr/actionBarSize"
+ android:paddingLeft="12dip"
+ android:paddingRight="12dip">
+ android:textAppearance="?attr/textAppearanceMedium"
+ style="?attr/buttonStyleSmall"
+ android:paddingLeft="4dip"
+ android:paddingRight="4dip" />
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index 0031a01a76ce3..b772809ef5d38 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -1380,6 +1380,7 @@
+
+
@@ -1454,10 +1459,10 @@
-
+
+
diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml
index e30adf3ce3ccf..9dbb1deb5ac6f 100644
--- a/core/res/res/values/themes.xml
+++ b/core/res/res/values/themes.xml
@@ -835,7 +835,7 @@
- @android:color/search_widget_corpus_item_background
- - @android:style/Widget.Holo.Spinner.DropDown
+ - @android:style/Widget.Holo.Spinner.DropDown.ActionBar
- @android:style/Widget.Holo.ActionButton
- @android:style/Widget.Holo.ActionButton.Overflow
- @android:drawable/cab_holo_dark
@@ -1064,17 +1064,17 @@
- @android:color/search_widget_corpus_item_background
- - @android:style/Widget.Holo.Spinner.DropDown
- - @android:style/Widget.Holo.ActionButton
- - @android:style/Widget.Holo.ActionButton.Overflow
+ - @android:style/Widget.Holo.Light.Spinner.DropDown.ActionBar
+ - @android:style/Widget.Holo.Light.ActionButton
+ - @android:style/Widget.Holo.Light.ActionButton.Overflow
- @android:drawable/cab_holo_light
- @android:drawable/cab_ic_close_holo
- - @style/Widget.Holo.ActionBarView_TabView
- - @style/Widget.Holo.ActionBarView_TabBar
- - @style/Widget.Holo.ActionBarView_TabText
+ - @style/Widget.Holo.Light.ActionBarView_TabView
+ - @style/Widget.Holo.Light.ActionBarView_TabBar
+ - @style/Widget.Holo.Light.ActionBarView_TabText
- @style/Widget.Holo.Light.ActionMode
- - @style/Widget.Holo.ActionButton.CloseMode
- - @android:style/Widget.Holo.ActionBar
+ - @style/Widget.Holo.Light.ActionButton.CloseMode
+ - @android:style/Widget.Holo.Light.ActionBar
- 56dip
- @drawable/divider_vertical_holo_light