Bug 1130203 - Update share overlay text colors to match mocks. r=mhaigh
authorMichael Comella <michael.l.comella@gmail.com>
Tue, 17 Mar 2015 17:55:27 -0700
changeset 265831 470465f520bf93a33e9f279e78419461907ee95e
parent 265830 9b7ad0bbbdff3a90d4856941768ef02aeffda15e
child 265832 3fefbfbc7e5152dceb35220645f93eb2738e3868
push id830
push userraliiev@mozilla.com
push dateFri, 19 Jun 2015 19:24:37 +0000
treeherdermozilla-release@932614382a68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmhaigh
bugs1130203
milestone39.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 1130203 - Update share overlay text colors to match mocks. r=mhaigh
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
@@ -76,20 +76,16 @@
   <!-- Default colors -->
   <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
@@ -813,17 +813,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>