Bug 1067429 - Add values-v14, removing v14-only styles from values-v11. r=lucasr, a=sledru
authorBrian Nicholson <bnicholson@mozilla.com>
Mon, 22 Sep 2014 11:46:34 -0700
changeset 216842 89d93cece9fd
parent 216841 112a9fe148d2
child 216843 008eb429e655
push id3939
push userryanvm@gmail.com
push date2014-09-25 15:14 +0000
treeherdermozilla-beta@c043fec932a6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslucasr, sledru
bugs1067429
milestone33.0
Bug 1067429 - Add values-v14, removing v14-only styles from values-v11. r=lucasr, a=sledru
mobile/android/base/resources/values-v11/themes.xml
mobile/android/base/resources/values-v14/themes.xml
--- a/mobile/android/base/resources/values-v11/themes.xml
+++ b/mobile/android/base/resources/values-v11/themes.xml
@@ -34,18 +34,16 @@
         Activity based themes for API 11+. This theme completely replaces
         GeckoAppBase from res/values/themes.xml on API 11+ devices.
     -->
     <style name="GeckoAppBase" parent="Gecko">
         <item name="android:actionButtonStyle">@style/GeckoActionBar.Button</item>
         <item name="android:actionModeCopyDrawable">@drawable/ab_copy</item>
         <item name="android:actionModeCutDrawable">@drawable/ab_cut</item>
         <item name="android:actionModePasteDrawable">@drawable/ab_paste</item>
-        <item name="android:actionModeSelectAllDrawable">@drawable/ab_select_all</item>
-        <item name="android:actionModeStyle">@style/GeckoActionBar</item>
         <item name="android:listViewStyle">@style/Widget.ListView</item>
         <item name="android:panelBackground">@drawable/menu_panel_bg</item>
         <item name="android:spinnerDropDownItemStyle">@style/Widget.DropDownItem.Spinner</item>
         <item name="android:spinnerItemStyle">@style/Widget.TextView.SpinnerItem</item>
         <item name="menuItemActionViewStyle">@style/Widget.MenuItemActionView</item>
         <item name="menuItemDefaultStyle">@style/Widget.MenuItemDefault</item>
         <item name="menuItemSecondaryActionBarStyle">@style/Widget.MenuItemSecondaryActionBar</item>
     </style>
copy from mobile/android/base/resources/values-v11/themes.xml
copy to mobile/android/base/resources/values-v14/themes.xml
--- a/mobile/android/base/resources/values-v11/themes.xml
+++ b/mobile/android/base/resources/values-v14/themes.xml
@@ -1,43 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <resources>
 
     <!--
-        Base application theme. This could be overridden by GeckoBaseTheme
-        in other res/values-XXX/themes.xml.
-    -->
-    <style name="GeckoBase" parent="@android:style/Theme.Holo.Light">
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowActionBar">false</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="arrowPopupWidth">match_parent</item>
-    </style>
-
-    <style name="GeckoDialogBase" parent="@android:style/Theme.Holo.Light.Dialog">
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowActionBar">false</item>
-        <item name="android:windowNoTitle">true</item>
-    </style>
-
-    <style name="GeckoTitleDialogBase" parent="@android:style/Theme.Holo.Light.Dialog" />
-
-    <style name="GeckoPreferencesBase" parent="GeckoBase">
-        <item name="android:windowActionBar">true</item>
-        <item name="android:windowNoTitle">false</item>
-        <item name="android:actionBarStyle">@style/ActionBar.GeckoPreferences</item>
-    </style>
-
-    <!--
-        Activity based themes for API 11+. This theme completely replaces
-        GeckoAppBase from res/values/themes.xml on API 11+ devices.
+        Activity based themes for API 14+. This theme completely replaces
+        GeckoAppBase from res/values/themes.xml on API 14+ devices.
     -->
     <style name="GeckoAppBase" parent="Gecko">
         <item name="android:actionButtonStyle">@style/GeckoActionBar.Button</item>
         <item name="android:actionModeCopyDrawable">@drawable/ab_copy</item>
         <item name="android:actionModeCutDrawable">@drawable/ab_cut</item>
         <item name="android:actionModePasteDrawable">@drawable/ab_paste</item>
         <item name="android:actionModeSelectAllDrawable">@drawable/ab_select_all</item>
         <item name="android:actionModeStyle">@style/GeckoActionBar</item>