Bug 1193974 - Remove new from tablet_* colors. r=mhaigh
authorMichael Comella <michael.l.comella@gmail.com>
Wed, 19 Aug 2015 15:59:43 -0700
changeset 291199 bac57019853ca1228cf0a1dca9b53019e01e1623
parent 291198 af84fe5e960e8fb3fe0a3662a853c8d5fed3e378
child 291200 4819bc95cbede50b35710f70f70d83f39cb1f6be
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmhaigh
bugs1193974
milestone43.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 1193974 - Remove new from tablet_* colors. r=mhaigh Refactor automated w/ Intellij.
mobile/android/base/resources/color-large-v11/tab_strip_item_bg.xml
mobile/android/base/resources/drawable-large-v11/browser_toolbar_action_bar_button.xml
mobile/android/base/resources/drawable-large-v11/tab_strip_button.xml
mobile/android/base/resources/drawable-large-v11/url_bar_nav_button.xml
mobile/android/base/resources/values/colors.xml
mobile/android/base/toolbar/NavButton.java
--- a/mobile/android/base/resources/color-large-v11/tab_strip_item_bg.xml
+++ b/mobile/android/base/resources/color-large-v11/tab_strip_item_bg.xml
@@ -27,20 +27,20 @@
     <item android:state_checked="true"
           gecko:state_light="true"
           android:color="@color/background_normal_lwt" />
     <item android:state_checked="true"
           gecko:state_dark="true"
           android:color="@color/background_normal_lwt" />
     <item android:state_pressed="true"
           gecko:state_light="true"
-          android:color="@color/new_tablet_highlight_lwt" />
+          android:color="@color/tablet_highlight_lwt" />
     <item android:state_pressed="true"
           gecko:state_dark="true"
-          android:color="@color/new_tablet_highlight_dark_lwt" />
+          android:color="@color/tablet_highlight_dark_lwt" />
 
     <item android:state_checked="true"
           android:color="@color/toolbar_grey" />
 
     <item android:state_pressed="true"
           android:color="@color/tabs_tray_grey_pressed" />
 
     <item android:color="@android:color/transparent"/>
--- a/mobile/android/base/resources/drawable-large-v11/browser_toolbar_action_bar_button.xml
+++ b/mobile/android/base/resources/drawable-large-v11/browser_toolbar_action_bar_button.xml
@@ -56,17 +56,17 @@
     <item 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"/>
+                <solid android:color="@color/tablet_highlight_focused"/>
                 <corners android:radius="@dimen/new_tablet_browser_toolbar_menu_item_corner_radius"/>
             </shape>
         </inset>
 
     </item>
 
     <item>
         <shape android:shape="rectangle">
--- a/mobile/android/base/resources/drawable-large-v11/tab_strip_button.xml
+++ b/mobile/android/base/resources/drawable-large-v11/tab_strip_button.xml
@@ -24,17 +24,17 @@
     <item android:state_focused="true"
           android:state_pressed="false">
 
         <inset android:insetTop="@dimen/new_tablet_tab_strip_button_inset"
                android:insetBottom="@dimen/new_tablet_tab_strip_button_inset"
                android:insetLeft="@dimen/new_tablet_tab_strip_button_inset"
                android:insetRight="@dimen/new_tablet_tab_strip_button_inset">
             <shape android:shape="rectangle">
-                <solid android:color="@color/new_tablet_highlight_focused"/>
+                <solid android:color="@color/tablet_highlight_focused"/>
                 <corners android:radius="@dimen/new_tablet_browser_toolbar_menu_item_corner_radius"/>
             </shape>
         </inset>
 
     </item>
 
     <item>
         <shape android:shape="rectangle">
--- a/mobile/android/base/resources/drawable-large-v11/url_bar_nav_button.xml
+++ b/mobile/android/base/resources/drawable-large-v11/url_bar_nav_button.xml
@@ -19,17 +19,17 @@
 
     <!-- pressed state -->
     <item android:state_pressed="true"
           android:drawable="@color/toolbar_grey_pressed"/>
 
     <!-- focused state -->
     <item android:state_focused="true"
           android:state_pressed="false"
-          android:drawable="@color/new_tablet_highlight_focused"/>
+          android:drawable="@color/tablet_highlight_focused"/>
 
     <!-- private browsing mode -->
     <item gecko:state_private="true"
           android:drawable="@color/tabs_tray_grey_pressed"/>
 
     <!-- normal mode -->
     <item android:drawable="@color/toolbar_grey"/>
 
--- a/mobile/android/base/resources/values/colors.xml
+++ b/mobile/android/base/resources/values/colors.xml
@@ -42,23 +42,23 @@
 
   <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>
 
   <!-- Synced w/ toolbar_grey_pressed -->
-  <color name="new_tablet_highlight_lwt">#AAD7D7DC</color>
+  <color name="tablet_highlight_lwt">#AAD7D7DC</color>
 
   <!-- Synced w/ tabs_tray_grey_pressed -->
-  <color name="new_tablet_highlight_dark_lwt">#AA45494E</color>
+  <color name="tablet_highlight_dark_lwt">#AA45494E</color>
 
   <!-- (bug 1077195) Focused state values are temporary. -->
-  <color name="new_tablet_highlight_focused">#C0C9D0</color>
+  <color name="tablet_highlight_focused">#C0C9D0</color>
 
   <!-- 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 text_and_tabs_tray_grey -->
   <color name="highlight_shaped_focused">#FF565B60</color>
 
   <!-- highlight on private nav button: 20% white over private_toolbar_grey -->
--- a/mobile/android/base/toolbar/NavButton.java
+++ b/mobile/android/base/toolbar/NavButton.java
@@ -66,17 +66,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.toolbar_grey_pressed));
         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(FOCUSED_STATE_SET, getColorDrawable(R.color.tablet_highlight_focused));
         stateList.addState(PRIVATE_STATE_SET, getColorDrawable(R.color.tabs_tray_grey_pressed));
         stateList.addState(EMPTY_STATE_SET, drawable);
 
         setBackgroundDrawable(stateList);
     }
 
     @Override
     public void onLightweightThemeReset() {