Bug 1134484 - Replace uses of @color/text_and_tabs_tray_grey. r=liuche
authorMichael Comella <michael.l.comella@gmail.com>
Tue, 31 Mar 2015 16:04:34 -0700
changeset 241157 eb326c47ab2df12f74742311e202052abd135db0
parent 241156 f8b7157f33fe5c74b5d68de598a433b4f9eea48a
child 241158 4b88fac7a66db11ac560a82baf9ef61011c565c7
push id59036
push usercbook@mozilla.com
push dateMon, 27 Apr 2015 10:37:48 +0000
treeherdermozilla-inbound@ad388474898c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersliuche
bugs1134484
milestone40.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 1134484 - Replace uses of @color/text_and_tabs_tray_grey. r=liuche
mobile/android/base/resources/drawable-large-v11/new_tablet_action_bar_button.xml
mobile/android/base/resources/drawable-large-v11/new_tablet_url_bar_nav_button.xml
mobile/android/base/resources/drawable/shaped_button.xml
mobile/android/base/resources/layout-large-v11/new_tablet_tab_strip.xml
mobile/android/base/resources/layout/tab_history_item_row.xml
mobile/android/base/resources/layout/tabs_panel_default.xml
mobile/android/base/resources/layout/tabs_panel_view.xml
mobile/android/base/resources/values-v16/search_styles.xml
mobile/android/base/resources/values-v21/themes.xml
mobile/android/base/resources/values/colors.xml
mobile/android/base/resources/values/search_styles.xml
mobile/android/base/resources/values/styles.xml
mobile/android/base/tabs/TabStrip.java
mobile/android/base/tabs/TabsPanel.java
mobile/android/base/toolbar/BrowserToolbarPhoneBase.java
mobile/android/base/toolbar/NavButton.java
mobile/android/base/toolbar/ShapedButton.java
--- a/mobile/android/base/resources/drawable-large-v11/new_tablet_action_bar_button.xml
+++ b/mobile/android/base/resources/drawable-large-v11/new_tablet_action_bar_button.xml
@@ -26,17 +26,17 @@
           android:state_focused="true"
           android:state_pressed="false">
 
         <inset android:insetTop="@dimen/new_tablet_browser_toolbar_menu_item_inset_vertical"
                android:insetBottom="@dimen/new_tablet_browser_toolbar_menu_item_inset_vertical"
                android:insetLeft="@dimen/new_tablet_browser_toolbar_menu_item_inset_horizontal"
                android:insetRight="@dimen/new_tablet_browser_toolbar_menu_item_inset_horizontal">
             <shape android:shape="rectangle">
-                <solid android:color="@color/new_tablet_highlight_focused_pb"/>
+                <solid android:color="@color/text_and_tabs_tray_grey"/>
                 <corners android:radius="@dimen/new_tablet_browser_toolbar_menu_item_corner_radius"/>
             </shape>
         </inset>
 
     </item>
 
     <item android:state_pressed="true"
           android:state_enabled="true">
--- a/mobile/android/base/resources/drawable-large-v11/new_tablet_url_bar_nav_button.xml
+++ b/mobile/android/base/resources/drawable-large-v11/new_tablet_url_bar_nav_button.xml
@@ -10,17 +10,17 @@
     <item gecko:state_private="true"
           android:state_pressed="true"
           android:drawable="@color/placeholder_active_grey"/>
 
     <!-- focused state -->
     <item gecko:state_private="true"
           android:state_focused="true"
           android:state_pressed="false"
-          android:drawable="@color/new_tablet_highlight_focused_pb"/>
+          android:drawable="@color/text_and_tabs_tray_grey"/>
 
     <!-- pressed state -->
     <item android:state_pressed="true"
           android:drawable="@color/new_tablet_highlight"/>
 
     <!-- focused state -->
     <item android:state_focused="true"
           android:state_pressed="false"
--- a/mobile/android/base/resources/drawable/shaped_button.xml
+++ b/mobile/android/base/resources/drawable/shaped_button.xml
@@ -7,11 +7,11 @@
 
     <item android:state_pressed="true"
           android:drawable="@color/highlight_shaped"/>
 
     <item android:state_focused="true"
           android:state_pressed="false"
           android:drawable="@color/highlight_shaped_focused"/>
  
-    <item android:drawable="@color/background_tabs"/>
+    <item android:drawable="@color/text_and_tabs_tray_grey"/>
 
 </selector>
--- a/mobile/android/base/resources/layout-large-v11/new_tablet_tab_strip.xml
+++ b/mobile/android/base/resources/layout-large-v11/new_tablet_tab_strip.xml
@@ -2,9 +2,9 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - 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/. -->
 
 <org.mozilla.gecko.tabs.TabStrip
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background_tabs"/>
+    android:background="@color/text_and_tabs_tray_grey"/>
--- a/mobile/android/base/resources/layout/tab_history_item_row.xml
+++ b/mobile/android/base/resources/layout/tab_history_item_row.xml
@@ -45,12 +45,12 @@
             style="@style/Widget.TwoLinePageRow.Title"
             android:layout_centerVertical="true"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:paddingRight="@dimen/tab_history_title_margin_right"
             android:text="@+id/tab_history_title"
             android:textSize="@dimen/tab_history_title_text_size"
-            android:textColor="@color/tab_history_title_color"
+            android:textColor="@color/text_and_tabs_tray_grey"
             gecko:fadeWidth="@dimen/tab_history_title_fading_width"/>
 
 </LinearLayout>
--- a/mobile/android/base/resources/layout/tabs_panel_default.xml
+++ b/mobile/android/base/resources/layout/tabs_panel_default.xml
@@ -11,17 +11,18 @@
          change it there! -->
     <RelativeLayout android:id="@+id/tabs_panel_header"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/browser_toolbar_height">
 
         <view class="org.mozilla.gecko.tabs.TabsPanel$TabsPanelToolbar"
               android:layout_width="match_parent"
               android:layout_height="@dimen/browser_toolbar_height"
-              android:background="@color/background_tabs">
+              android:layout_height="match_parent"
+              android:background="@color/text_and_tabs_tray_grey">
 
             <ViewStub android:id="@+id/nav_back_stub"
                       android:layout="@layout/new_tablet_tabs_panel_back_button"
                       android:layout_width="wrap_content"
                       android:layout_height="match_parent"/>
 
             <org.mozilla.gecko.widget.IconTabWidget android:id="@+id/tab_widget"
                                                     android:layout_width="wrap_content"
--- a/mobile/android/base/resources/layout/tabs_panel_view.xml
+++ b/mobile/android/base/resources/layout/tabs_panel_view.xml
@@ -4,11 +4,11 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- The tabs panel is initial hidden on startup. It will be made
      visible when the user activates it. See TabsPanel.show() -->
 <org.mozilla.gecko.tabs.TabsPanel xmlns:android="http://schemas.android.com/apk/res/android"
                                   android:id="@+id/tabs_panel"
                                   android:layout_width="match_parent"
                                   android:layout_height="match_parent"
-                                  android:background="@color/background_tabs"
+                                  android:background="@color/text_and_tabs_tray_grey"
                                   android:orientation="vertical"
                                   android:visibility="invisible"/>
--- a/mobile/android/base/resources/values-v16/search_styles.xml
+++ b/mobile/android/base/resources/values-v16/search_styles.xml
@@ -1,16 +1,16 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - 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/. -->
 
 <resources>
 
     <style name="TextAppearance.EmptyView.Title" parent="@android:style/TextAppearance.Small">
-        <item name="android:textColor">#363B40</item>
+        <item name="android:textColor">@color/text_and_tabs_tray_grey</item>
         <item name="android:textSize">20sp</item>
         <item name="android:fontFamily">sans-serif-light</item>
     </style>
 
     <style name="TextAppearance.EmptyView.Message" parent="@android:style/TextAppearance.Small">
         <item name="android:textColor">@color/placeholder_grey</item>
         <item name="android:textSize">16sp</item>
         <item name="android:lineSpacingExtra">4sp</item>
--- a/mobile/android/base/resources/values-v21/themes.xml
+++ b/mobile/android/base/resources/values-v21/themes.xml
@@ -4,15 +4,15 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <resources>
 
     <!--
         Base application theme.
     -->
     <style name="GeckoBase" parent="@android:style/Theme.Material.Light">
-        <item name="android:colorPrimary">@color/primary</item>
-        <item name="android:colorPrimaryDark">@color/background_tabs</item>
+        <item name="android:colorPrimary">@color/text_and_tabs_tray_grey</item>
+        <item name="android:colorPrimaryDark">@color/text_and_tabs_tray_grey</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowContentOverlay">@null</item>
     </style>
 
 </resources>
--- a/mobile/android/base/resources/values/colors.xml
+++ b/mobile/android/base/resources/values/colors.xml
@@ -21,46 +21,42 @@
   <color name="tabs_tray_icon_grey">#AFB1B3</color>
   <color name="disabled_grey">#BFBFBF</color>
   <color name="toolbar_grey_pressed">#D7D7DC</color>
   <color name="toolbar_menu_dark_grey">#E1E1E6</color>
   <color name="toolbar_grey">#EBEBF0</color>
   <color name="about_page_header_grey">#F5F5F5</color>
 
   <!-- Non-palette colors -->
-  <color name="primary">#363B40</color>
-
   <color name="background_light">#FFF5F5F5</color>
 
   <!-- If you update one, update the other. -->
   <color name="background_normal">#FFEBEBF0</color>
   <color name="background_normal_lwt">#DDEBEBF0</color>
 
-  <color name="background_tabs">#FF363B40</color>
   <color name="highlight">#33000000</color>
   <color name="highlight_focused">#1A000000</color>
   <color name="highlight_dark">#33FFFFFF</color>
   <color name="highlight_dark_focused">#1AFFFFFF</color>
 
   <!-- If you update one, update the other. -->
   <color name="new_tablet_highlight">#D7D7DC</color>
   <color name="new_tablet_highlight_lwt">#AAD7D7DC</color>
 
   <!-- If you update one, update the other. -->
   <color name="new_tablet_highlight_dark">#45494E</color>
   <color name="new_tablet_highlight_dark_lwt">#AA45494E</color>
 
   <!-- (bug 1077195) Focused state values are temporary. -->
   <color name="new_tablet_highlight_focused">#C0C9D0</color>
-  <color name="new_tablet_highlight_focused_pb">#363B40</color>
 
-  <!-- highlight on shaped button: 20% white over background_tabs -->
+  <!-- highlight on shaped button: 20% white over text_and_tabs_tray_grey -->
   <color name="highlight_shaped">#FF696D71</color>
 
-  <!-- highlight-focused on shaped button: 10% white over background_tabs -->
+  <!-- highlight-focused on shaped button: 10% white over text_and_tabs_tray_grey -->
   <color name="highlight_shaped_focused">#FF565B60</color>
 
   <!-- highlight on private nav button: 20% white over private_toolbar_grey -->
   <color name="highlight_nav_pb">#FF545654</color>
 
   <!-- highlight-focused on private nav button: 10% white over private_toolbar_grey -->
   <color name="highlight_nav_focused_pb">#FF3F423F</color>
 
@@ -156,17 +152,16 @@
   <color name="toast_button_background">#00000000</color>
   <color name="toast_button_pressed">#DD2C3136</color>
   <color name="toast_button_text">#FFFFFFFF</color>
 
   <!-- Tab History colors. -->
   <color name="tab_history_timeline_separator">#D7D9DB</color>
   <color name="tab_history_favicon_border">#D7D9DB</color>
   <color name="tab_history_favicon_background">#FFFFFF</color>
-  <color name="tab_history_title_color">#363B40</color>
   <color name="tab_history_border_color">#DADADF</color>
 
   <!-- Colour used for Find-In-Page dialog -->
   <color name="find_status_default">#AFB1B3</color>
   <color name="find_matchcase_on">#AFB1B3</color>
   <color name="find_matchcase_off">#D02626</color>
 
   <!-- Canvas delegate paint color -->
--- a/mobile/android/base/resources/values/search_styles.xml
+++ b/mobile/android/base/resources/values/search_styles.xml
@@ -23,17 +23,17 @@
         <item name="android:textSize">15sp</item>
         <item name="android:textColor">@color/facet_button_text_color</item>
         <item name="android:background">@drawable/facet_button_background</item>
         <item name="android:gravity">center</item>
         <item name="android:clickable">true</item>
     </style>
 
     <style name="TextAppearance.EmptyView.Title" parent="@android:style/TextAppearance.Small">
-        <item name="android:textColor">#363B40</item>
+        <item name="android:textColor">@color/text_and_tabs_tray_grey</item>
         <item name="android:textSize">20sp</item>
     </style>
 
     <style name="TextAppearance.EmptyView.Message" parent="@android:style/TextAppearance.Small">
         <item name="android:textColor">@color/placeholder_grey</item>
         <item name="android:textSize">16sp</item>
     </style>
 
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -595,17 +595,17 @@
     <style name="TabWidget">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">40dip</item>
         <item name="android:layout_weight">1.0</item>
     </style>
 
     <!-- Find bar -->
     <style name="FindBar">
-        <item name="android:background">@color/background_tabs</item>
+        <item name="android:background">@color/text_and_tabs_tray_grey</item>
         <item name="android:paddingLeft">3dip</item>
         <item name="android:paddingRight">3dip</item>
         <item name="android:paddingTop">6dip</item>
         <item name="android:paddingBottom">6dip</item>
     </style>
 
     <!-- Find bar - Image Button -->
     <style name="FindBar.ImageButton">
@@ -789,17 +789,17 @@
         <item name="android:paddingTop">0dp</item>
     </style>
 
     <style name="TextAppearance.FirstrunLight"/>
     <style name="TextAppearance.FirstrunRegular"/>
 
     <style name="TextAppearance.FirstrunLight.Main">
         <item name="android:textSize">20sp</item>
-        <item name="android:textColor">#363B40</item>
+        <item name="android:textColor">@color/text_and_tabs_tray_grey</item>
     </style>
 
     <style name="TextAppearance.FirstrunRegular.Body">
         <item name="android:textSize">16sp</item>
         <item name="android:textColor">@color/placeholder_grey</item>
         <item name="android:lineSpacingMultiplier">1.25</item>
     </style>
 
--- a/mobile/android/base/tabs/TabStrip.java
+++ b/mobile/android/base/tabs/TabStrip.java
@@ -138,20 +138,20 @@ public class TabStrip extends ThemedLine
     @Override
     public void onLightweightThemeChanged() {
         final Drawable drawable = getTheme().getDrawable(this);
         if (drawable == null) {
             return;
         }
 
         final StateListDrawable stateList = new StateListDrawable();
-        stateList.addState(PRIVATE_STATE_SET, getColorDrawable(R.color.background_tabs));
+        stateList.addState(PRIVATE_STATE_SET, getColorDrawable(R.color.text_and_tabs_tray_grey));
         stateList.addState(EMPTY_STATE_SET, drawable);
 
         setBackgroundDrawable(stateList);
     }
 
     @Override
     public void onLightweightThemeReset() {
-        final int defaultBackgroundColor = getResources().getColor(R.color.background_tabs);
+        final int defaultBackgroundColor = getResources().getColor(R.color.text_and_tabs_tray_grey);
         setBackgroundColor(defaultBackgroundColor);
     }
 }
--- a/mobile/android/base/tabs/TabsPanel.java
+++ b/mobile/android/base/tabs/TabsPanel.java
@@ -269,28 +269,28 @@ public class TabsPanel extends LinearLay
     public void onDetachedFromWindow() {
         super.onDetachedFromWindow();
         mTheme.removeListener(this);
     }
 
     @Override
     @SuppressWarnings("deprecation") // setBackgroundDrawable deprecated by API level 16
     public void onLightweightThemeChanged() {
-        final int background = getResources().getColor(R.color.background_tabs);
+        final int background = getResources().getColor(R.color.text_and_tabs_tray_grey);
         final LightweightThemeDrawable drawable = mTheme.getColorDrawable(this, background, true);
         if (drawable == null)
             return;
 
         drawable.setAlpha(34, 0);
         setBackgroundDrawable(drawable);
     }
 
     @Override
     public void onLightweightThemeReset() {
-        setBackgroundColor(getContext().getResources().getColor(R.color.background_tabs));
+        setBackgroundColor(getContext().getResources().getColor(R.color.text_and_tabs_tray_grey));
     }
 
     @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
         super.onLayout(changed, left, top, right, bottom);
         onLightweightThemeChanged();
     }
 
@@ -340,28 +340,28 @@ public class TabsPanel extends LinearLay
         public void onDetachedFromWindow() {
             super.onDetachedFromWindow();
             mTheme.removeListener(this);
         }
 
         @Override
         @SuppressWarnings("deprecation") // setBackgroundDrawable deprecated by API level 16
         public void onLightweightThemeChanged() {
-            final int background = getResources().getColor(R.color.background_tabs);
+            final int background = getResources().getColor(R.color.text_and_tabs_tray_grey);
             final LightweightThemeDrawable drawable = mTheme.getColorDrawable(this, background);
             if (drawable == null)
                 return;
 
             drawable.setAlpha(34, 34);
             setBackgroundDrawable(drawable);
         }
 
         @Override
         public void onLightweightThemeReset() {
-            setBackgroundColor(getContext().getResources().getColor(R.color.background_tabs));
+            setBackgroundColor(getContext().getResources().getColor(R.color.text_and_tabs_tray_grey));
         }
 
         @Override
         protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
             super.onLayout(changed, left, top, right, bottom);
             onLightweightThemeChanged();
         }
     }
--- a/mobile/android/base/toolbar/BrowserToolbarPhoneBase.java
+++ b/mobile/android/base/toolbar/BrowserToolbarPhoneBase.java
@@ -58,17 +58,17 @@ abstract class BrowserToolbarPhoneBase e
         roundCornerShape = new Path();
         roundCornerShape.moveTo(0, 0);
         roundCornerShape.lineTo(30, 0);
         roundCornerShape.cubicTo(0, 0, 0, 0, 0, 30);
         roundCornerShape.lineTo(0, 0);
 
         roundCornerPaint = new Paint();
         roundCornerPaint.setAntiAlias(true);
-        roundCornerPaint.setColor(res.getColor(R.color.background_tabs));
+        roundCornerPaint.setColor(res.getColor(R.color.text_and_tabs_tray_grey));
         roundCornerPaint.setStrokeWidth(0.0f);
     }
 
     @Override
     public void onAttachedToWindow() {
         super.onAttachedToWindow();
 
         editCancel.setOnClickListener(new OnClickListener() {
--- a/mobile/android/base/toolbar/NavButton.java
+++ b/mobile/android/base/toolbar/NavButton.java
@@ -65,17 +65,17 @@ abstract class NavButton extends ShapedB
 
         if (drawable == null) {
             return;
         }
 
         final StateListDrawable stateList = new StateListDrawable();
         stateList.addState(PRIVATE_PRESSED_STATE_SET, getColorDrawable(R.color.placeholder_active_grey));
         stateList.addState(PRESSED_ENABLED_STATE_SET, getColorDrawable(R.color.new_tablet_highlight));
-        stateList.addState(PRIVATE_FOCUSED_STATE_SET, getColorDrawable(R.color.new_tablet_highlight_focused_pb));
+        stateList.addState(PRIVATE_FOCUSED_STATE_SET, getColorDrawable(R.color.text_and_tabs_tray_grey));
         stateList.addState(FOCUSED_STATE_SET, getColorDrawable(R.color.new_tablet_highlight_focused));
         stateList.addState(PRIVATE_STATE_SET, getColorDrawable(R.color.private_toolbar_grey));
         stateList.addState(EMPTY_STATE_SET, drawable);
 
         setBackgroundDrawable(stateList);
     }
 
     @Override
--- a/mobile/android/base/toolbar/ShapedButton.java
+++ b/mobile/android/base/toolbar/ShapedButton.java
@@ -53,28 +53,28 @@ public class ShapedButton extends Themed
     @Override
     public void defaultDraw(Canvas canvas) {
         super.draw(canvas);
     }
 
     // The drawable is constructed as per @drawable/shaped_button.
     @Override
     public void onLightweightThemeChanged() {
-        final int background = getResources().getColor(R.color.background_tabs);
+        final int background = getResources().getColor(R.color.text_and_tabs_tray_grey);
         final LightweightThemeDrawable lightWeight = getTheme().getColorDrawable(this, background);
 
         if (lightWeight == null)
             return;
 
         lightWeight.setAlpha(34, 34);
 
         final StateListDrawable stateList = new StateListDrawable();
         stateList.addState(PRESSED_ENABLED_STATE_SET, getColorDrawable(R.color.highlight_shaped));
         stateList.addState(FOCUSED_STATE_SET, getColorDrawable(R.color.highlight_shaped_focused));
-        stateList.addState(PRIVATE_STATE_SET, getColorDrawable(R.color.background_tabs));
+        stateList.addState(PRIVATE_STATE_SET, getColorDrawable(R.color.text_and_tabs_tray_grey));
         stateList.addState(EMPTY_STATE_SET, lightWeight);
 
         setBackgroundDrawable(stateList);
     }
 
     @Override
     public void onLightweightThemeReset() {
         setBackgroundResource(R.drawable.shaped_button);