Bug 1134484 - Replace all uses of @color/fennec_ui_orange. r=liuche
authorMichael Comella <michael.l.comella@gmail.com>
Wed, 25 Feb 2015 16:00:12 -0800
changeset 230951 c6a8c48e01261358cf1ec1919023e4fd64d21e6a
parent 230950 e124c25545d2bcb2ffea61eb2491659a2f65054a
child 231087 5badb47eed193b148f04649403c42f3d71a7733f
push id11524
push usermichael.l.comella@gmail.com
push dateFri, 27 Feb 2015 00:39:48 +0000
treeherderfx-team@c6a8c48e0126 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersliuche
bugs1134484
milestone39.0a1
Bug 1134484 - Replace all uses of @color/fennec_ui_orange. r=liuche Commands run were: ag #FFFF9500 .. -l | grep -v colors.xml | xargs sed -i "s/#FFFF9500/@color\/fennec_ui_orange/g" ag #FF9500 .. -l | grep -v colors.xml | xargs sed -i "s/#FF9500/@color\/fennec_ui_orange/g" ag text_color_highlight .. -l | grep -v colors.xml | xargs sed -i "s/text_color_highlight\([^_]\)/fennec_ui_orange\1/g" ag url_bar_text_highlight .. -l | grep -v colors.xml | xargs sed -i "s/url_bar_text_highlight\([^_]\)/fennec_ui_orange\1/g" ag highlight_orange .. -l | grep -v colors.xml | xargs sed -i "s/highlight_orange/fennec_ui_orange/g" Then text_color_highlight and url_bar_text_highlight were manually deleted from colors.xml and highlight_orange was manually deleted from search_colors.xml. Note that there are still two uses of #B3FF9500 in the code as opposed to fennec_ui_orange of #FF9500.
mobile/android/base/CustomEditText.java
mobile/android/base/resources/drawable/progressbar.xml
mobile/android/base/resources/drawable/suggestion_selector.xml
mobile/android/base/resources/drawable/tab_thumbnail.xml
mobile/android/base/resources/layout/doorhanger.xml
mobile/android/base/resources/layout/find_in_page_content.xml
mobile/android/base/resources/layout/firstrun_pane.xml
mobile/android/base/resources/layout/home_pager.xml
mobile/android/base/resources/layout/pin_site_dialog.xml
mobile/android/base/resources/layout/search_bar.xml
mobile/android/base/resources/values/colors.xml
mobile/android/base/resources/values/search_colors.xml
mobile/android/base/resources/values/styles.xml
mobile/android/base/resources/values/themes.xml
--- a/mobile/android/base/CustomEditText.java
+++ b/mobile/android/base/CustomEditText.java
@@ -76,13 +76,13 @@ public class CustomEditText extends Them
         return mHighlightColor;
     }
 
     @Override
     public void setPrivateMode(boolean isPrivate) {
         super.setPrivateMode(isPrivate);
 
         mHighlightColor = getContext().getResources().getColor(isPrivate
-                ? R.color.url_bar_text_highlight_pb : R.color.url_bar_text_highlight);
+                ? R.color.url_bar_text_highlight_pb : R.color.fennec_ui_orange);
         // android:textColorHighlight cannot support a ColorStateList.
         setHighlightColor(mHighlightColor);
     }
 }
--- a/mobile/android/base/resources/drawable/progressbar.xml
+++ b/mobile/android/base/resources/drawable/progressbar.xml
@@ -1,9 +1,9 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@android:id/progress">
         <clip>
             <shape>
-                <solid android:color="@color/highlight_orange"/>
+                <solid android:color="@color/fennec_ui_orange"/>
             </shape>
         </clip>
     </item>
 </layer-list>
--- a/mobile/android/base/resources/drawable/suggestion_selector.xml
+++ b/mobile/android/base/resources/drawable/suggestion_selector.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:state_pressed="true">
         <shape>
             <gradient android:angle="90"
                       android:startColor="#E66000"
-                      android:endColor="#FF9500"
+                      android:endColor="@color/fennec_ui_orange"
                       android:type="linear"/>
 
             <corners android:radius="4dp"/>
         </shape>
     </item>
 
     <item android:state_focused="true"
           android:state_enabled="true">
--- a/mobile/android/base/resources/drawable/tab_thumbnail.xml
+++ b/mobile/android/base/resources/drawable/tab_thumbnail.xml
@@ -34,17 +34,17 @@
     </item>
 
     <item android:state_focused="false"
           android:state_pressed="false"
           android:state_checked="true"
           gecko:state_recording="false">
 
         <shape android:shape="rectangle">
-            <solid android:color="#FFFF9500"/>
+            <solid android:color="@color/fennec_ui_orange"/>
             <corners android:radius="3dp"/>            
         </shape>
 
     </item>
 
     <item android:drawable="@android:color/transparent"/>
 
 </selector>
--- a/mobile/android/base/resources/layout/doorhanger.xml
+++ b/mobile/android/base/resources/layout/doorhanger.xml
@@ -47,12 +47,12 @@
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"
                   android:orientation="horizontal"
                   android:visibility="gone"/>
 
     <View android:id="@+id/divider_doorhanger"
           android:layout_width="match_parent"
           android:layout_height="1dp"
-          android:background="#FFFF9500"
+          android:background="@color/fennec_ui_orange"
           android:visibility="gone"/>
 
 </merge>
--- a/mobile/android/base/resources/layout/find_in_page_content.xml
+++ b/mobile/android/base/resources/layout/find_in_page_content.xml
@@ -11,17 +11,17 @@
               android:contentDescription="@string/find_text"
               android:background="@drawable/url_bar_entry"
               android:singleLine="true"
               android:textColor="#000000"
               android:textCursorDrawable="@null"
               android:inputType="text"
               android:paddingLeft="@dimen/find_in_page_text_padding_left"
               android:paddingRight="@dimen/find_in_page_text_padding_right"
-              android:textColorHighlight="@color/url_bar_text_highlight"
+              android:textColorHighlight="@color/fennec_ui_orange"
               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"
--- a/mobile/android/base/resources/layout/firstrun_pane.xml
+++ b/mobile/android/base/resources/layout/firstrun_pane.xml
@@ -17,12 +17,12 @@
                     android:background="@color/firstrun_pager_background">
 
         <org.mozilla.gecko.home.HomePagerTabStrip android:id="@+id/firstrun_tab_strip"
                            android:layout_width="match_parent"
                            android:layout_height="40dp"
                            android:layout_gravity="top"
                            android:gravity="center_vertical"
                            android:background="@color/firstrun_tabstrip"
-                           gecko:tabIndicatorColor="@color/text_color_highlight"
+                           gecko:tabIndicatorColor="@color/fennec_ui_orange"
                            android:textColor="@color/android:white"/>
     </org.mozilla.gecko.firstrun.FirstrunPager>
 </org.mozilla.gecko.firstrun.FirstrunPane>
--- a/mobile/android/base/resources/layout/home_pager.xml
+++ b/mobile/android/base/resources/layout/home_pager.xml
@@ -13,12 +13,12 @@
                                   android:layout_height="match_parent"
                                   android:background="@android:color/white">
 
     <org.mozilla.gecko.home.HomePagerTabStrip android:layout_width="match_parent"
                                               android:layout_height="@dimen/tabs_strip_height"
                                               android:layout_gravity="top"
                                               android:gravity="center_vertical"
                                               android:background="@color/background_light"
-                                              gecko:tabIndicatorColor="@color/text_color_highlight"
+                                              gecko:tabIndicatorColor="@color/fennec_ui_orange"
                                               android:textAppearance="@style/TextAppearance.Widget.HomePagerTabStrip"/>
 
 </org.mozilla.gecko.home.HomePager>
--- a/mobile/android/base/resources/layout/pin_site_dialog.xml
+++ b/mobile/android/base/resources/layout/pin_site_dialog.xml
@@ -18,17 +18,17 @@
                   style="@style/UrlBar.Button"
                   android:layout_width="match_parent"
                   android:layout_height="match_parent"
                   android:padding="6dip"
                   android:hint="@string/pin_site_dialog_hint"
                   android:background="@drawable/url_bar_entry"
                   android:textColor="@color/url_bar_title"
                   android:textColorHint="@color/url_bar_title_hint"
-                  android:textColorHighlight="@color/url_bar_text_highlight"
+                  android:textColorHighlight="@color/fennec_ui_orange"
                   android:textSelectHandle="@drawable/handle_middle"
                   android:textSelectHandleLeft="@drawable/handle_start"
                   android:textSelectHandleRight="@drawable/handle_end"
                   android:textCursorDrawable="@null"
                   android:inputType="textUri|textNoSuggestions"
                   android:imeOptions="actionGo|flagNoExtractUi|flagNoFullscreen"
                   android:singleLine="true"
                   android:gravity="center_vertical|left"/>
--- a/mobile/android/base/resources/layout/search_bar.xml
+++ b/mobile/android/base/resources/layout/search_bar.xml
@@ -11,17 +11,17 @@
         android:layout_gravity="center_vertical"
         android:imeOptions="actionSearch"
         android:inputType="textNoSuggestions"
         android:drawableLeft="@drawable/search_icon_inactive"
         android:drawablePadding="5dp"
         android:textSize="@dimen/query_text_size"
         android:focusable="false"
         android:focusableInTouchMode="false"
-        android:textColorHighlight="@color/highlight_orange"
+        android:textColorHighlight="@color/fennec_ui_orange"
         android:textSelectHandle="@drawable/handle_middle"
         android:textSelectHandleLeft="@drawable/handle_start"
         android:textSelectHandleRight="@drawable/handle_end" />
 
     <ImageButton
         android:id="@+id/clear_button"
         android:layout_width="30dp"
         android:layout_height="30dp"
--- a/mobile/android/base/resources/values/colors.xml
+++ b/mobile/android/base/resources/values/colors.xml
@@ -100,17 +100,16 @@
   <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>
 
   <!-- Highlight colors -->
-  <color name="text_color_highlight">#FF9500</color>
   <color name="text_color_highlight_inverse">#D06BFF</color>
 
   <!-- Link colors -->
   <color name="text_color_link">#22629E</color>
 
   <!-- Divider colors -->
   <color name="divider_light">#FFD7D9DB</color>
   <color name="divider_dark">#FFB3C2CE</color>
@@ -120,17 +119,16 @@
   <color name="splash_urlfont">#000000</color>
   <color name="splash_content">#ffffff</color>
 
   <color name="doorhanger_text">#FF222222</color>
   <color name="doorhanger_link">#FF2AA1FE</color>
   <color name="doorhanger_background_dark">#FFDDE4EA</color>
 
   <color name="validation_message_text">#ffffff</color>
-  <color name="url_bar_text_highlight">#FFFF9500</color>
   <color name="url_bar_text_highlight_pb">#FFD06BFF</color>
   <color name="suggestion_primary">#dddddd</color>
   <color name="suggestion_pressed">#bbbbbb</color>
   <color name="tab_row_pressed">#4D000000</color>
 
   <color name="textbox_background">#FFF</color>
   <color name="textbox_background_disabled">#DDD</color>
   <color name="textbox_stroke">#000</color>
--- 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="highlight_orange">#FF9500</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>
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -138,17 +138,17 @@
     <style name="Widget.ReadingListRow.Description">
         <item name="android:textAppearance">@style/TextAppearance.Widget.Home.ItemDescription</item>
         <item name="android:maxLines">3</item>
         <item name="android:ellipsize">end</item>
         <item name="android:lineSpacingMultiplier">1.3</item>
     </style>
 
     <style name="Widget.ReadingListRow.ReadTime">
-        <item name="android:textColor">@color/text_color_highlight</item>
+        <item name="android:textColor">@color/fennec_ui_orange</item>
     </style>
 
     <style name="Widget.BookmarkFolderView" parent="Widget.TwoLinePageRow.Title">
         <item name="android:singleLine">true</item>
         <item name="android:ellipsize">none</item>
         <item name="android:paddingLeft">10dip</item>
         <item name="android:drawablePadding">10dip</item>
         <item name="android:drawableLeft">@drawable/bookmark_folder</item>
@@ -287,17 +287,17 @@
         Note: Gecko uses light theme as default, while Android uses dark.
         If Android convention has to be followd, the list of colors specified 
         in themes.xml would be inverse, and things would get confusing.
         Hence, Gecko's TextAppearance is based on text over light theme and
         TextAppearance.Inverse is based on text over dark theme.
     -->
     <style name="TextAppearance">
         <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:textColorHighlight">@color/text_color_highlight</item>
+        <item name="android:textColorHighlight">@color/fennec_ui_orange</item>
         <item name="android:textColorHint">?android:attr/textColorHint</item>
         <item name="android:textColorLink">?android:attr/textColorLink</item>
         <item name="android:textSize">@dimen/menu_item_textsize</item>
         <item name="android:textStyle">normal</item>
     </style>
 
     <style name="TextAppearance.Inverse">
         <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
@@ -452,17 +452,17 @@
         <item name="android:background">@android:color/transparent</item>
     </style>
 
     <!-- URL bar - Button -->
     <style name="UrlBar.Title" parent="UrlBar.Button">
         <item name="android:textAppearance">@style/TextAppearance.UrlBar.Title</item>
         <item name="android:textColor">@color/url_bar_title</item>
         <item name="android:textColorHint">@color/url_bar_title_hint</item>
-        <item name="android:textColorHighlight">@color/url_bar_text_highlight</item>
+        <item name="android:textColorHighlight">@color/fennec_ui_orange</item>
         <item name="android:textSelectHandle">@drawable/handle_middle</item>
         <item name="android:textSelectHandleLeft">@drawable/handle_start</item>
         <item name="android:textSelectHandleRight">@drawable/handle_end</item>
         <item name="android:textCursorDrawable">@null</item>
         <item name="android:singleLine">true</item>
         <item name="android:gravity">center_vertical|left</item>
         <item name="android:hint">@string/url_bar_default_text</item>
     </style>
--- a/mobile/android/base/resources/values/themes.xml
+++ b/mobile/android/base/resources/values/themes.xml
@@ -44,17 +44,17 @@
         <!-- Disabled colors -->
         <item name="android:textColorPrimaryDisableOnly">@color/text_color_primary_disable_only</item>
 
         <!-- Hint colors -->
         <item name="android:textColorHint">@color/text_color_hint</item>
         <item name="android:textColorHintInverse">@color/text_color_hint_inverse</item>
 
         <!-- Highlight colors -->
-        <item name="android:textColorHighlight">@color/text_color_highlight</item>
+        <item name="android:textColorHighlight">@color/fennec_ui_orange</item>
         <item name="android:textColorHighlightInverse">@color/text_color_highlight_inverse</item>
 
         <!-- Link colors -->
         <item name="android:textColorLink">@color/text_color_link</item>
 
         <!-- TextAppearances -->
         <item name="android:textAppearance">@style/TextAppearance</item>
         <item name="android:textAppearanceInverse">@style/TextAppearance.Inverse</item>