Bug 1021123 - Improve colors in remote tabs pull-to-refresh. r=mcomella
authorMargaret Leibovic <margaret.leibovic@gmail.com>
Fri, 06 Jun 2014 11:52:48 -0700
changeset 207502 a33f76e3ff8afcf920fdff4b7cfbf06ce58db647
parent 207501 7bb8f92028d92b160a8798f4a70e29c3eacedc25
child 207503 ba028f407ebfd62dd7ab9bf3025c0d8031ac84c2
child 207563 4f945ab9cc3c47433edc1f9204b506847486301e
push id494
push userraliiev@mozilla.com
push dateMon, 25 Aug 2014 18:42:16 +0000
treeherdermozilla-release@a3cc3e46b571 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmcomella
bugs1021123
milestone32.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 1021123 - Improve colors in remote tabs pull-to-refresh. r=mcomella
mobile/android/base/resources/values/colors.xml
mobile/android/base/tabspanel/RemoteTabsContainerPanel.java
--- a/mobile/android/base/resources/values/colors.xml
+++ b/mobile/android/base/resources/values/colors.xml
@@ -88,20 +88,25 @@
   <color name="url_bar_domaintext_private">#FFF</color>
   <color name="url_bar_blockedtext">#b14646</color>
   <color name="url_bar_shadow">#12000000</color>
 
   <color name="home_button_bar_bg">#FFF5F7F9</color>
 
   <color name="panel_image_item_background">#D1D9E1</color>
 
-  <!-- Swipe to refresh colors -->
+  <!-- Swipe to refresh colors for dynamic panel -->
   <color name="swipe_refresh_orange">#FFFFC26C</color>
   <color name="swipe_refresh_white">#FFFFFFFF</color>
-  <color name="swipe_refresh_orange_dark">#FF9500</color>
+
+  <!-- Swipe to refresh colors for remote tabs -->
+  <color name="swipe_refresh_orange1">#EE6700</color>
+  <color name="swipe_refresh_orange2">#FF9400</color>
+  <color name="swipe_refresh_orange3">#F57900</color>
+  <color name="swipe_refresh_orange4">#FFB44C</color>
 
   <!-- Remote tabs setup -->
   <color name="remote_tabs_setup_button_background">#E66000</color>
   <color name="remote_tabs_setup_button_background_hit">#D95300</color>
 
   <!-- Button toast colors. -->
   <color name="toast_button_background">#FF2A2A2A</color>
   <color name="toast_button_pressed">#FF3E6784</color>
--- a/mobile/android/base/tabspanel/RemoteTabsContainerPanel.java
+++ b/mobile/android/base/tabspanel/RemoteTabsContainerPanel.java
@@ -55,18 +55,18 @@ public class RemoteTabsContainerPanel ex
 
     @Override
     public void addView(View child, int index, ViewGroup.LayoutParams params) {
         super.addView(child, index, params);
 
         list = (RemoteTabsList) child;
 
         // Must be called after the child view has been added.
-        setColorScheme(R.color.swipe_refresh_orange_dark, R.color.background_tabs,
-                       R.color.swipe_refresh_orange_dark, R.color.background_tabs);
+        setColorScheme(R.color.swipe_refresh_orange1, R.color.swipe_refresh_orange2,
+                       R.color.swipe_refresh_orange3, R.color.swipe_refresh_orange4);
     }
 
 
     @Override
     public boolean canChildScrollUp() {
         // We are not supporting swipe-to-refresh for old sync. This disables
         // the swipe gesture if no FxA are detected.
         if (FirefoxAccounts.firefoxAccountsExist(getContext())) {