Bug 1201206 - Inherit from appCompat on v21 prefs and restore action bar style. r=mhaigh
☠☠ backed out by 1ffccf0304f3 ☠ ☠
authorMichael Comella <michael.l.comella@gmail.com>
Tue, 15 Sep 2015 15:07:05 -0700
changeset 300307 2d7962287928829803e68fe5cd1aeabd69003837
parent 300306 bfc7e7f997eb2a4f5bbfea4e817aa4e738900d5b
child 300308 c01f712e3d98c74a03f1dcf9c5133c0c8982d32d
push id5392
push userraliiev@mozilla.com
push dateMon, 14 Dec 2015 20:08:23 +0000
treeherdermozilla-beta@16ce8562a975 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmhaigh
bugs1201206
milestone44.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 1201206 - Inherit from appCompat on v21 prefs and restore action bar style. r=mhaigh
mobile/android/base/resources/values-v21/styles.xml
mobile/android/base/resources/values-v21/themes.xml
new file mode 100644
--- /dev/null
+++ b/mobile/android/base/resources/values-v21/styles.xml
@@ -0,0 +1,19 @@
+<?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>
+
+   <style name="ActionBarTitleTextStyle" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title">
+      <item name="android:textColor">#fff</item>
+   </style>
+
+   <style name="ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.ActionBar">
+      <item name="android:colorControlNormal">#fff</item>
+
+      <!-- This color is the system default. -->
+      <item name="android:colorControlHighlight">#65696D</item>
+   </style>
+
+</resources>
--- a/mobile/android/base/resources/values-v21/themes.xml
+++ b/mobile/android/base/resources/values-v21/themes.xml
@@ -9,24 +9,33 @@
         Base application theme.
     -->
     <style name="GeckoBase" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="android:colorPrimary">@color/text_and_tabs_tray_grey</item>
         <item name="android:colorPrimaryDark">@color/text_and_tabs_tray_grey</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:actionBarStyle">@style/GeckoActionBar</item>
+        <item name="android:actionBarTheme">@style/ActionBarTheme</item>
         <item name="android:colorAccent">@color/action_orange</item>
     </style>
 
+    <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>
+
     <style name="ActionBar.FxAccountStatusActivity" parent="@android:style/Widget.Material.ActionBar.Solid">
         <item name="android:displayOptions">homeAsUp|showTitle</item>
+        <item name="android:titleTextStyle">@style/ActionBarTitleTextStyle</item>
     </style>
 
     <style name="ActionBar.GeckoPreferences" parent="@android:style/Widget.Material.ActionBar.Solid">
+        <item name="android:titleTextStyle">@style/ActionBarTitleTextStyle</item>
     </style>
 
     <style name="GeckoAppBase" parent="Gecko">
         <item name="android:actionButtonStyle">@style/GeckoActionBar.Button</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>