Bug 878613 - Fix styling of spinner popups. r=sriram
authorWes Johnston <wjohnston@mozilla.com>
Tue, 11 Jun 2013 12:14:44 -0700
changeset 134682 14b4165dc0e28e10ca75988d06a16bfcf2c91c67
parent 134681 d038d584102c8535594fa6da75dfad2bb81484c5
child 134683 3a6cd8d533b758de31bb354b22dee94fc0d9dbb7
push id29329
push userwjohnston@mozilla.com
push dateTue, 11 Jun 2013 19:14:53 +0000
treeherdermozilla-inbound@14b4165dc0e2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssriram
bugs878613
milestone24.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 878613 - Fix styling of spinner popups. r=sriram
mobile/android/base/DoorHanger.java
mobile/android/base/resources/values-v11/styles.xml
mobile/android/base/resources/values-v11/themes.xml
mobile/android/base/resources/values/dimens.xml
mobile/android/base/resources/values/styles.xml
mobile/android/base/resources/values/themes.xml
--- a/mobile/android/base/DoorHanger.java
+++ b/mobile/android/base/DoorHanger.java
@@ -64,17 +64,17 @@ public class DoorHanger extends LinearLa
     DoorHanger(Context context, DoorHangerPopup popup, int tabId, String value) {
         super(context);
 
         mPopup = popup;
         mTabId = tabId;
         mValue = value;
 
         if (sInputPadding == -1) {
-            sInputPadding = getResources().getDimensionPixelSize(R.dimen.doorhanger_padding_spinners);
+            sInputPadding = getResources().getDimensionPixelSize(R.dimen.doorhanger_padding);
         }
         if (sSpinnerTextColor == -1) {
             sSpinnerTextColor = getResources().getColor(R.color.text_color_primary_disable_only);
         }
         if (sSpinnerTextSize == -1) {
             sSpinnerTextSize = getResources().getDimensionPixelSize(R.dimen.doorhanger_spinner_textsize);
         }
     }
--- a/mobile/android/base/resources/values-v11/styles.xml
+++ b/mobile/android/base/resources/values-v11/styles.xml
@@ -69,18 +69,18 @@
     <!-- DropDown List View -->
     <style name="DropDownListView" parent="@android:style/Widget.Holo.ListView.DropDown">
          <item name="android:listSelector">@drawable/action_bar_button</item>
          <item name="android:divider">#FFD1D5DA</item>
          <item name="android:dividerHeight">1dp</item>
     </style>
 
     <!-- Spinner DropDown Item -->
-    <style name="SpinnerDropDownItem" parent="@android:style/Widget.Holo.DropDownItem.Spinner">
-         <item name="android:textColor">#FF222222</item>
+    <style name="Widget.DropDownItem.Spinner" parent="@android:style/Widget.Holo.Light.DropDownItem.Spinner">
+         <item name="android:textColor">#FF000000</item>
     </style>
 
     <style name="Widget.Spinner" parent="android:style/Widget.Holo.Light.Spinner">
         <item name="android:minWidth">@dimen/doorhanger_input_width</item>
     </style>
 
     <style name="Widget.TextView.SpinnerItem" parent="android:style/Widget.Holo.Light.TextView.SpinnerItem">
         <item name="android:textColor">#FF000000</item>
--- a/mobile/android/base/resources/values-v11/themes.xml
+++ b/mobile/android/base/resources/values-v11/themes.xml
@@ -39,14 +39,15 @@
         Activity based themes.
     -->
     <style name="Gecko.App">
         <item name="android:windowBackground">@color/background_normal</item>
         <item name="android:panelBackground">@drawable/menu_panel_bg</item>
         <item name="android:listViewStyle">@style/Widget.ListView</item>
         <item name="android:spinnerStyle">@style/Widget.Spinner</item>
         <item name="android:spinnerItemStyle">@style/Widget.TextView.SpinnerItem</item>
+        <item name="android:spinnerDropDownItemStyle">@style/Widget.DropDownItem.Spinner</item>
         <item name="menuItemActionBarStyle">@style/Widget.MenuItemActionBar</item>
         <item name="menuItemActionViewStyle">@style/Widget.MenuItemActionView</item>
         <item name="menuItemDefaultStyle">@style/Widget.MenuItemDefault</item>
     </style>
 
 </resources>
--- a/mobile/android/base/resources/values/dimens.xml
+++ b/mobile/android/base/resources/values/dimens.xml
@@ -34,17 +34,16 @@
     <dimen name="favicon_bg">32dp</dimen>
     <dimen name="favicon_bg_radius">1dp</dimen>
 
     <!-- Max width of the doorhanger on tablets -->
     <dimen name="doorhanger_width">400dp</dimen>
     <dimen name="doorhanger_input_width">250dp</dimen>
     <dimen name="doorhanger_spinner_textsize">9sp</dimen>
     <dimen name="doorhanger_padding">15dp</dimen>
-    <dimen name="doorhanger_padding_spinners">10dp</dimen>
 
     <dimen name="flow_layout_spacing">6dp</dimen>
     <dimen name="menu_item_action_icon">80dp</dimen>
     <dimen name="menu_item_icon">21dp</dimen>
     <dimen name="menu_item_state_icon">18dp</dimen>
     <dimen name="menu_item_row_height">44dp</dimen>
     <dimen name="menu_item_row_width">240dp</dimen>
     <dimen name="menu_popup_arrow_margin">5dip</dimen>
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -64,18 +64,16 @@
         <item name="android:checkMark">?android:attr/listChoiceIndicatorMultiple</item>
         <item name="android:ellipsize">marquee</item>
     </style>
 
     <style name="Widget.Spinner" parent="android:style/Widget.Spinner">
         <item name="android:minWidth">@dimen/doorhanger_input_width</item>
     </style>
 
-    <style name="Widget.TextView.SpinnerItem" parent="android:style/Widget.TextView.SpinnerItem"/>
-
     <style name="Widget.MenuItemActionBar">
         <item name="android:padding">@dimen/browser_toolbar_button_padding</item>
         <item name="android:background">@drawable/action_bar_button</item>
         <item name="android:scaleType">fitCenter</item>
     </style>
 
     <style name="Widget.MenuItemActionView">
         <item name="android:divider">@drawable/divider_vertical</item>
--- a/mobile/android/base/resources/values/themes.xml
+++ b/mobile/android/base/resources/values/themes.xml
@@ -77,17 +77,16 @@
     -->
     <style name="Gecko.App">
         <item name="android:windowBackground">@color/background_normal</item>
         <item name="android:buttonStyle">@style/Widget.Button</item>
         <item name="android:dropDownItemStyle">@style/Widget.DropDownItem</item>
         <item name="android:editTextStyle">@style/Widget.EditText</item>
         <item name="android:textViewStyle">@style/Widget.TextView</item>
         <item name="android:spinnerStyle">@style/Widget.Spinner</item>
-        <item name="android:spinnerItemStyle">@style/Widget.TextView.SpinnerItem</item>
     </style>
 
     <style name="Gecko.AwesomeBar" parent="GeckoAwesomeBarBase">
         <item name="android:listViewStyle">@style/Widget.ListView</item>
         <item name="android:expandableListViewStyle">@style/Widget.ExpandableListView</item>
     </style>
 
     <style name="Gecko.Preferences" parent="GeckoPreferencesBase"/>