Bug 1268606 - Correct action bar style for url bar. r=liuche draft
authorMichael Comella <michael.l.comella@gmail.com>
Mon, 23 May 2016 19:15:46 -0700
changeset 370003 b2d26a05053993e89f5f0c1d5738900b8054d0da
parent 369835 3ff4077f9e4bf923322c95fb7226bc0e9090f898
child 521671 4618aff110d9a4849315b0f53b1969e18ddfb06f
push id18974
push usermichael.l.comella@gmail.com
push dateTue, 24 May 2016 03:37:07 +0000
reviewersliuche
bugs1268606
milestone49.0a1
Bug 1268606 - Correct action bar style for url bar. r=liuche MozReview-Commit-ID: 7mCwUzR7rqE
mobile/android/base/resources/drawable-hdpi/ab_background.9.png
mobile/android/base/resources/drawable-xhdpi/ab_background.9.png
mobile/android/base/resources/values-v11/styles.xml
mobile/android/base/resources/values-v21/themes.xml
mobile/android/base/resources/values/styles.xml
mobile/android/base/resources/values/themes.xml
deleted file mode 100644
index 5d6242cf04f2d396080999899836d92f4768daba..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 7a3387ae0b479b47ab8f6069e01c486b5bbed599..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mobile/android/base/resources/values-v11/styles.xml
+++ b/mobile/android/base/resources/values-v11/styles.xml
@@ -72,20 +72,16 @@
     <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>
     </style>
 
-    <style name="GeckoActionBar" parent="@android:style/Widget.Holo.Light.ActionMode">
-        <item name="android:background">@drawable/ab_background</item>
-    </style>
-
     <style name="TextAppearance.Widget.ActionBar.Title" parent="@android:style/TextAppearance.Medium"/>
 
     <style name="GeckoActionBar.Title" parent="TextAppearance.Widget.ActionBar.Title">
         <item name="android:drawableLeft">@drawable/ab_done</item>
         <item name="android:background">@android:color/transparent</item>
         <item name="android:paddingLeft">15dp</item>
         <item name="android:paddingRight">15dp</item>
         <!-- gravity and minWidth are added here to more resemble our values/styles.xml
--- a/mobile/android/base/resources/values-v21/themes.xml
+++ b/mobile/android/base/resources/values-v21/themes.xml
@@ -9,18 +9,16 @@
         Base application theme.
     -->
     <style name="GeckoBase" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="colorPrimary">@color/text_and_tabs_tray_grey</item>
         <item name="colorPrimaryDark">@color/text_and_tabs_tray_grey</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="android:windowContentOverlay">@null</item>
-        <item name="android:actionBarStyle">@style/GeckoActionBar</item>
-        <!-- TODO (bug 1220863): Once we extend AppCompatActivity, set actionBarStyle. -->
         <item name="android:alertDialogTheme">@style/GeckoAlertDialog</item>
     </style>
 
     <style name="GeckoPreferencesBase" parent="Gecko">
         <item name="windowActionBar">true</item>
         <item name="windowNoTitle">false</item>
     </style>
 
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -657,18 +657,20 @@
         <item name="android:textAppearance">?android:textAppearanceSmall</item>
     </style>
 
     <style name="ToastButton" parent="ToastButtonBase">
         <item name="android:textAppearance">?android:textAppearanceSmall</item>
         <item name="android:textStyle">bold</item>
     </style>
 
-    <style name="GeckoActionBar">
-        <item name="android:background">@drawable/ab_background</item>
+    <style name="GeckoActionBar" parent="ThemeOverlay.AppCompat.ActionBar">
+        <item name="colorBackground">@color/toolbar_grey</item>
+        <item name="colorAccent">@color/fennec_ui_orange</item>
+        <item name="colorControlNormal">@color/toolbar_icon_grey</item>
     </style>
 
     <style name="GeckoActionBar.Title">
         <item name="android:gravity">center_vertical</item>
         <item name="android:minWidth">0dp</item>
         <item name="android:background">@android:color/transparent</item>
         <item name="android:textAppearance">@style/TextAppearance.Medium</item>
         <item name="android:drawableLeft">@drawable/ab_done</item>
--- a/mobile/android/base/resources/values/themes.xml
+++ b/mobile/android/base/resources/values/themes.xml
@@ -61,16 +61,18 @@
         <item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
         <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
         <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
         <item name="android:textAppearanceLargeInverse">@style/TextAppearance.Large.Inverse</item>
         <item name="android:textAppearanceMediumInverse">@style/TextAppearance.Medium.Inverse</item>
         <item name="android:textAppearanceSmallInverse">@style/TextAppearance.Small.Inverse</item>
 
         <item name="colorAccent">@color/action_orange</item>
+
+        <item name="actionBarTheme">@style/GeckoActionBar</item>
     </style>
 
     <style name="Gecko.Dialog" parent="GeckoDialogBase"/>
 
     <style name="Gecko.TitleDialog" parent="GeckoTitleDialogBase"/>
 
     <!--
         Activity based themes, dependent on API level. This theme is replaced