Bug 1148550 - Update GeckoMenu pressed color. r=mhaigh
authorMichael Comella <michael.l.comella@gmail.com>
Thu, 20 Aug 2015 12:43:48 -0700
changeset 260403 22580b5776c299c62c8b0bae879b2652e3816f12
parent 260402 f546981ba4dc1a7369e2e602fbdd93d4f695cf54
child 260404 0cc28c71117e2393dad210fc5689e1e9c203d327
push id64495
push userryanvm@gmail.com
push dateWed, 02 Sep 2015 01:16:33 +0000
treeherdermozilla-inbound@e747377d86eb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmhaigh
bugs1148550
milestone43.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 1148550 - Update GeckoMenu pressed color. r=mhaigh This also involved moving a redundant background declaration to only the containing style.
mobile/android/base/resources/drawable/menu_item_action_bar_bg.xml
mobile/android/base/resources/layout/menu_item_action_view.xml
mobile/android/base/resources/values/styles.xml
copy from mobile/android/base/resources/drawable/action_bar_button.xml
copy to mobile/android/base/resources/drawable/menu_item_action_bar_bg.xml
--- a/mobile/android/base/resources/drawable/action_bar_button.xml
+++ b/mobile/android/base/resources/drawable/menu_item_action_bar_bg.xml
@@ -3,17 +3,17 @@
    - 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/. -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:state_pressed="true"
           android:state_enabled="true">
         <shape>
-            <solid android:color="@color/highlight" />
+            <solid android:color="@color/toolbar_grey_pressed" />
         </shape>
     </item>
 
     <item android:state_focused="true"
           android:state_pressed="false">
         <shape>
             <solid android:color="@color/highlight_focused" />
         </shape>
--- a/mobile/android/base/resources/layout/menu_item_action_view.xml
+++ b/mobile/android/base/resources/layout/menu_item_action_view.xml
@@ -10,24 +10,23 @@
     <FrameLayout android:layout_width="0dip"
                  android:layout_height="@dimen/menu_item_row_height"
                  android:layout_weight="1.0">
 
         <org.mozilla.gecko.menu.MenuItemDefault
                 android:id="@+id/menu_item"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@drawable/action_bar_button"
+                android:background="@drawable/menu_item_action_bar_bg"
                 android:clickable="true"
                 android:focusable="true"/>
 
         <org.mozilla.gecko.menu.MenuItemActionBar
                 style="@style/Widget.MenuItemSecondaryActionBar"
                 android:id="@+id/menu_item_button"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@drawable/action_bar_button"
                 android:layout_gravity="center_vertical"
                 android:visibility="gone"/>
 
     </FrameLayout>
 
 </merge>
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -76,29 +76,30 @@
         <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.GeckoMenuListView" parent="Widget.ListView">
+        <item name="android:listSelector">@drawable/menu_item_action_bar_bg</item>
         <item name="android:divider">@color/divider_light</item>
     </style>
 
     <style name="Widget.MenuItemActionBar">
         <item name="android:padding">8dip</item>
-        <item name="android:background">@drawable/action_bar_button</item>
+        <item name="android:background">@drawable/menu_item_action_bar_bg</item>
         <item name="android:scaleType">fitCenter</item>
         <item name="drawableTintList">@color/action_bar_menu_item_colors</item>"
     </style>
 
     <style name="Widget.MenuItemSecondaryActionBar">
         <item name="android:padding">8dip</item>
-        <item name="android:background">@drawable/action_bar_button</item>
+        <item name="android:background">@drawable/menu_item_action_bar_bg</item>
         <item name="android:scaleType">centerInside</item>
         <item name="drawableTintList">@color/action_bar_secondary_menu_item_colors</item>
     </style>
 
     <style name="Widget.MenuItemActionView">
         <item name="android:gravity">left</item>
     </style>