From fd261e57b49fb8646bae996eed5ee097779b089a Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Tue, 25 Aug 2015 17:22:11 -0700
Subject: [PATCH] Bug 1196553 - Set secondary action bar colors on phone.
 r=margaret

I previously set this for tablet but didn't (for an unknown reason) set this
for phones as well.

--HG--
rename : mobile/android/base/resources/color-large-v11/action_bar_secondary_menu_item_colors.xml => mobile/android/base/resources/color/action_bar_secondary_menu_item_colors.xml
extra : commitid : 9xV13qVkTCr
extra : rebase_source : f5c310d1ac68096be557a8992ba366bb0c99df0a
---
 .../action_bar_secondary_menu_item_colors.xml              | 0
 mobile/android/base/resources/values-large-v11/styles.xml  | 4 ----
 mobile/android/base/resources/values/styles.xml            | 7 ++-----
 3 files changed, 2 insertions(+), 9 deletions(-)
 rename mobile/android/base/resources/{color-large-v11 => color}/action_bar_secondary_menu_item_colors.xml (100%)

diff --git a/mobile/android/base/resources/color-large-v11/action_bar_secondary_menu_item_colors.xml b/mobile/android/base/resources/color/action_bar_secondary_menu_item_colors.xml
similarity index 100%
rename from mobile/android/base/resources/color-large-v11/action_bar_secondary_menu_item_colors.xml
rename to mobile/android/base/resources/color/action_bar_secondary_menu_item_colors.xml
diff --git a/mobile/android/base/resources/values-large-v11/styles.xml b/mobile/android/base/resources/values-large-v11/styles.xml
index 8b6e1960a524..1a771faa7621 100644
--- a/mobile/android/base/resources/values-large-v11/styles.xml
+++ b/mobile/android/base/resources/values-large-v11/styles.xml
@@ -64,10 +64,6 @@
         <item name="android:paddingRight">@dimen/tablet_browser_toolbar_menu_item_padding_horizontal</item>
     </style>
 
-    <style name="Widget.MenuItemSecondaryActionBar" parent="Widget.MenuItemSecondaryActionBarBase">
-        <item name="drawableTintList">@color/action_bar_secondary_menu_item_colors</item>
-    </style>
-
     <style name="Widget.BookmarksListView" parent="Widget.HomeListView">
         <item name="android:scrollbarStyle">outsideOverlay</item>
     </style>
diff --git a/mobile/android/base/resources/values/styles.xml b/mobile/android/base/resources/values/styles.xml
index 1120b70250c8..836fb823b296 100644
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -91,14 +91,11 @@
         <item name="drawableTintList">@color/action_bar_menu_item_colors</item>"
     </style>
 
-    <style name="Widget.MenuItemSecondaryActionBarBase">
+    <style name="Widget.MenuItemSecondaryActionBar">
         <item name="android:padding">8dip</item>
         <item name="android:background">@drawable/action_bar_button</item>
         <item name="android:scaleType">centerInside</item>
-    </style>
-
-    <style name="Widget.MenuItemSecondaryActionBar" parent="Widget.MenuItemSecondaryActionBarBase">
-        <!-- Overridden in large config -->
+        <item name="drawableTintList">@color/action_bar_secondary_menu_item_colors</item>
     </style>
 
     <style name="Widget.MenuItemActionView">