Bug 1130203 - Update share overlay row pressed color & color names. r=mhaigh a=sylvestre
authorMichael Comella <michael.l.comella@gmail.com>
Wed, 18 Mar 2015 17:17:08 -0700
changeset 258348 f2cbe1ec6d5a
parent 258347 49441819b75a
child 258349 abff0e240078
push id4648
push usermichael.l.comella@gmail.com
push date2015-04-08 16:26 +0000
treeherdermozilla-beta@e399294c9df3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmhaigh, sylvestre
bugs1130203
milestone38.0
Bug 1130203 - Update share overlay row pressed color & color names. r=mhaigh a=sylvestre Switched over to using Fennec color palette rather than specific duplicate colors.
mobile/android/base/resources/drawable/overlay_share_button_background.xml
mobile/android/base/resources/drawable/overlay_share_button_background_first.xml
mobile/android/base/resources/values/colors.xml
--- a/mobile/android/base/resources/drawable/overlay_share_button_background.xml
+++ b/mobile/android/base/resources/drawable/overlay_share_button_background.xml
@@ -4,12 +4,12 @@
   - 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/.
   -->
 
 <!-- Should be kept in sync with overlay_share_button_background_first.xml -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_pressed="true" android:drawable="@color/overlay_share_selected" />
-    <item android:drawable="@color/overlay_share_background"/>
+    <item android:state_pressed="true" android:drawable="@color/toolbar_grey_pressed" />
+    <item android:drawable="@color/toolbar_grey"/>
 
 </selector>
--- a/mobile/android/base/resources/drawable/overlay_share_button_background_first.xml
+++ b/mobile/android/base/resources/drawable/overlay_share_button_background_first.xml
@@ -7,23 +7,23 @@
 
 <!-- Should be kept in sync with overlay_share_button_background.xml
 
      This first item in the list has rounded corners. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:state_pressed="true">
         <shape>
-            <solid android:color="@color/overlay_share_selected"/>
+            <solid android:color="@color/toolbar_grey_pressed"/>
             <corners android:topLeftRadius="@dimen/button_corner_radius"
                      android:topRightRadius="@dimen/button_corner_radius"/>
         </shape>
     </item>
 
     <item>
         <shape>
-            <solid android:color="@color/overlay_share_background"/>
+            <solid android:color="@color/toolbar_grey"/>
             <corners android:topLeftRadius="@dimen/button_corner_radius"
                      android:topRightRadius="@dimen/button_corner_radius"/>
         </shape>
     </item>
 
 </selector>
--- a/mobile/android/base/resources/values/colors.xml
+++ b/mobile/android/base/resources/values/colors.xml
@@ -59,20 +59,16 @@
   <color name="text_color_secondary">#777777</color>
   <color name="text_color_tertiary">#9198A1</color>
 
   <!-- Default inverse colors -->
   <color name="text_color_primary_inverse">#F5F5F5</color>
   <color name="text_color_secondary_inverse">#DDDDDD</color>
   <color name="text_color_tertiary_inverse">#A4A7A9</color>
 
-  <!-- Colours used for share overlay button background -->
-  <color name="overlay_share_background">#FFEBEBF0</color>
-  <color name="overlay_share_selected">#FFF5F5F5</color>
-
   <!-- Disabled colors -->
   <color name="text_color_primary_disable_only">#999999</color>
 
   <!-- Hint colors -->
   <color name="text_color_hint">#666666</color>
   <color name="text_color_hint_inverse">#7F828A</color>
   <color name="text_color_hint_floating_focused">#33b5e5</color>