Bug 1130203 - Update share overlay text colors to match mocks. r=mhaigh a=sylvestre
authorMichael Comella <michael.l.comella@gmail.com>
Tue, 17 Mar 2015 17:55:27 -0700
changeset 258342 ca3650a73fdf
parent 258341 c3ec8ada4705
child 258343 41eba60614f8
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 text colors to match mocks. r=mhaigh a=sylvestre
mobile/android/base/resources/color/overlay_btn_text.xml
mobile/android/base/resources/color/primary_text_selector.xml
mobile/android/base/resources/values/colors.xml
mobile/android/base/resources/values/styles.xml
rename from mobile/android/base/resources/color/overlay_btn_text.xml
rename to mobile/android/base/resources/color/primary_text_selector.xml
--- a/mobile/android/base/resources/color/overlay_btn_text.xml
+++ b/mobile/android/base/resources/color/primary_text_selector.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_enabled="false" android:color="@color/text_color_overlaybtn_disabled" />
-    <item android:color="@color/text_color_overlaybtn" />
+    <item android:state_enabled="false" android:color="@color/disabled_grey" />
+    <item android:color="@color/text_and_tabs_tray_grey" />
 
 </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>
 
-  <!-- Colour used for share overlay button labels -->
-  <color name="text_color_overlaybtn">#666666</color>
-  <color name="text_color_overlaybtn_disabled">#AFB1B3</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 -->
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -811,17 +811,17 @@
         <item name="android:focusableInTouchMode">false</item>
         <item name="android:layout_margin">0dp</item>
     </style>
 
     <style name="ShareOverlayButton.Text">
         <item name="android:drawablePadding">15dp</item>
         <item name="android:maxLines">1</item>
         <item name="android:textSize">14sp</item>
-        <item name="android:textColor">@color/overlay_btn_text</item>
+        <item name="android:textColor">@color/primary_text_selector</item>
     </style>
 
     <style name="ShareOverlayButton.Text.Container">
         <item name="android:padding">0dp</item>
         <item name="android:orientation">horizontal</item>
         <item name="android:background">@drawable/overlay_share_button_background</item>
     </style>