Bug 1134484 - Replace uses of @color/tabs_tray_icon_grey. r=liuche
authorMichael Comella <michael.l.comella@gmail.com>
Tue, 31 Mar 2015 16:17:43 -0700
changeset 240925 81b06d7506593754598322ff9348db82a5205a03
parent 240924 d713b06ac1f01ba7a74cfb5d2da0e744d9bb520d
child 240926 24f82e8e71bd940c1ca6f669f9f490565c6918bc
push id12573
push usermichael.l.comella@gmail.com
push dateFri, 24 Apr 2015 19:10:40 +0000
treeherderfx-team@6e18d1c774b8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersliuche
bugs1134484
milestone40.0a1
Bug 1134484 - Replace uses of @color/tabs_tray_icon_grey. r=liuche
mobile/android/base/RemoteTabsExpandableListAdapter.java
mobile/android/base/resources/color-large-v11/new_tablet_tab_item_title.xml
mobile/android/base/resources/drawable/edit_text_default.xml
mobile/android/base/resources/drawable/find_matchcase_selector.xml
mobile/android/base/resources/layout/find_in_page_content.xml
mobile/android/base/resources/layout/home_remote_tabs_hidden_devices_footer.xml
mobile/android/base/resources/values/colors.xml
mobile/android/base/resources/values/search_colors.xml
mobile/android/base/resources/values/styles.xml
--- a/mobile/android/base/RemoteTabsExpandableListAdapter.java
+++ b/mobile/android/base/RemoteTabsExpandableListAdapter.java
@@ -150,17 +150,17 @@ public class RemoteTabsExpandableListAda
         final int deviceExpandedResId;
 
         if (isExpanded && !client.tabs.isEmpty()) {
             deviceTypeResId = "desktop".equals(client.deviceType) ? R.drawable.sync_desktop : R.drawable.sync_mobile;
             textColorResId = R.color.placeholder_active_grey;
             deviceExpandedResId = showGroupIndicator ? R.drawable.home_group_expanded : R.drawable.home_group_collapsed;
         } else {
             deviceTypeResId = "desktop".equals(client.deviceType) ? R.drawable.sync_desktop_inactive : R.drawable.sync_mobile_inactive;
-            textColorResId = R.color.home_text_color_disabled;
+            textColorResId = R.color.tabs_tray_icon_grey;
             deviceExpandedResId = showGroupIndicator ? R.drawable.home_group_collapsed : 0;
         }
 
         // Now update the UI.
         holder.nameView.setText(client.name);
         holder.nameView.setTextColor(context.getResources().getColor(textColorResId));
 
         final long now = System.currentTimeMillis();
--- a/mobile/android/base/resources/color-large-v11/new_tablet_tab_item_title.xml
+++ b/mobile/android/base/resources/color-large-v11/new_tablet_tab_item_title.xml
@@ -2,11 +2,11 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:state_checked="true"
           android:color="@color/text_color_primary_inverse"/>
 
     <item android:state_pressed="true"
           android:color="@color/text_color_primary_inverse"/>
 
-    <item android:color="@color/new_tablet_tab_grid_text_unselected"/>
+    <item android:color="@color/tabs_tray_icon_grey"/>
 
 </selector>
--- a/mobile/android/base/resources/drawable/edit_text_default.xml
+++ b/mobile/android/base/resources/drawable/edit_text_default.xml
@@ -12,13 +12,13 @@
         <shape>
             <!-- Padding creates vertical space between the text and the underline,
                  as well as right padding for search icon/clear button -->
             <padding
                 android:top="@dimen/search_bar_padding_y"
                 android:bottom="@dimen/search_bar_padding_y"
                 android:right="@dimen/search_bar_padding_right"/>
             <solid android:color="@android:color/transparent"/>
-            <stroke android:width="1dp" android:color="@color/edit_text_default"/>
+            <stroke android:width="1dp" android:color="@color/tabs_tray_icon_grey"/>
         </shape>
     </item>
 
 </layer-list>
--- a/mobile/android/base/resources/drawable/find_matchcase_selector.xml
+++ b/mobile/android/base/resources/drawable/find_matchcase_selector.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 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/. -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:state_checked="true"
-          android:color="@color/find_matchcase_on"/>
+          android:color="@color/tabs_tray_icon_grey"/>
 
     <item android:state_checked="false"
           android:color="@color/find_matchcase_off"/>
 
 </selector>
--- a/mobile/android/base/resources/layout/find_in_page_content.xml
+++ b/mobile/android/base/resources/layout/find_in_page_content.xml
@@ -20,17 +20,17 @@
               android:imeOptions="actionSearch"
               android:selectAllOnFocus="true"
               android:gravity="center_vertical|left"/>
 
     <TextView android:id="@+id/find_status"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:layout_marginRight="@dimen/find_in_page_status_margin_right"
-              android:textColor="@color/find_status_default"
+              android:textColor="@color/tabs_tray_icon_grey"
               android:visibility="gone"/>
 
     <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
                      android:id="@+id/find_matchcase"
                      android:layout_width="wrap_content"
                      android:layout_height="wrap_content"
                      android:padding="@dimen/find_in_page_matchcase_padding"
                      android:checked="false"
--- a/mobile/android/base/resources/layout/home_remote_tabs_hidden_devices_footer.xml
+++ b/mobile/android/base/resources/layout/home_remote_tabs_hidden_devices_footer.xml
@@ -18,11 +18,11 @@
     <TextView
         android:id="@+id/hidden_devices"
         style="@style/Widget.Home.ActionItem"
         android:background="@drawable/action_bar_button"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="center"
         android:maxLength="1024"
-        android:textColor="@color/home_text_color_disabled" />
+        android:textColor="@color/tabs_tray_icon_grey" />
 
 </LinearLayout>
--- a/mobile/android/base/resources/values/colors.xml
+++ b/mobile/android/base/resources/values/colors.xml
@@ -122,19 +122,16 @@
   <color name="url_bar_domaintext_private">#FFF</color>
   <color name="url_bar_blockedtext">#b14646</color>
   <color name="url_bar_shadow">#12000000</color>
 
   <color name="nav_button_border_color">#BFBFBF</color>
 
   <color name="home_button_bar_bg">#FFF5F7F9</color>
 
-  <!-- Colour used for share overlay button labels -->
-  <color name="home_text_color_disabled">#AFB1B3</color>
-
   <color name="panel_image_item_background">#D1D9E1</color>
 
   <!-- Swipe to refresh colors for dynamic panel -->
   <color name="swipe_refresh_orange">#FFFFC26C</color>
   <color name="swipe_refresh_white">#FFFFFFFF</color>
 
   <!-- Swipe to refresh colors for remote tabs -->
   <color name="swipe_refresh_orange1">#EE6700</color>
@@ -153,24 +150,18 @@
 
   <!-- 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_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 -->
   <color name="canvas_delegate_paint">#FFFF0000</color>
 
   <!-- Top sites thumbnail colors -->
   <color name="top_site_default">#FFECF0F3</color>
   <color name="top_site_border">#FFCFD9E1</color>
 
-  <!-- Tab grid text highlight colour -->
-  <color name="new_tablet_tab_grid_text_unselected">#FFAFB1B3</color>
-
-
 </resources>
--- a/mobile/android/base/resources/values/search_colors.xml
+++ b/mobile/android/base/resources/values/search_colors.xml
@@ -1,18 +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>
 
     <color name="global_background_color">#EBEBF0</color>
 
-    <color name="edit_text_default">#AFB1B3</color>
-
     <!-- card colors -->
     <color name="row_background">#ffffff</color>
     <color name="row_background_pressed">#DCDCE1</color>
 
     <color name="widget_logo_default">#EBEBF0</color>
     <color name="widget_button_pressed">#33000000</color>
 
     <!--Facet button colors-->
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -398,17 +398,17 @@
 
     <style name="TextAppearance.Widget.Home.PageAction" parent="TextAppearance.Small">
         <item name="android:textColor">#00ACFF</item>
     </style>
 
     <style name="TextAppearance.Widget.Home.ItemTitle" parent="TextAppearance.Medium"/>
 
     <style name="TextAppearance.Widget.Home.ItemDescription" parent="TextAppearance.Micro">
-        <item name="android:textColor">#AFB1B3</item>
+        <item name="android:textColor">@color/tabs_tray_icon_grey</item>
     </style>
 
     <style name="TextAppearance.Widget.HomeBanner" parent="TextAppearance.Small">
         <item name="android:textColor">?android:attr/textColorHint</item>
     </style>
 
     <style name="TextAppearance.DoorHanger">
         <item name="android:textColor">@color/placeholder_active_grey</item>