Bug 762724: Tabs button arrows should change direction on expand/collapse. [r=mfinkle]

--HG--
rename : mobile/android/base/resources/drawable-hdpi/tabs_carat.png => mobile/android/base/resources/drawable-hdpi/tabs_carat_contracted.png
rename : mobile/android/base/resources/drawable-land-hdpi-v14/tabs_carat.png => mobile/android/base/resources/drawable-land-hdpi-v14/tabs_carat_contracted.png
rename : mobile/android/base/resources/drawable-land-mdpi-v14/tabs_carat.png => mobile/android/base/resources/drawable-land-mdpi-v14/tabs_carat_contracted.png
rename : mobile/android/base/resources/drawable-land-xhdpi-v14/tabs_carat.png => mobile/android/base/resources/drawable-land-xhdpi-v14/tabs_carat_contracted.png
rename : mobile/android/base/resources/drawable-sw600dp-hdpi/tabs_carat.png => mobile/android/base/resources/drawable-sw600dp-hdpi/tabs_carat_contracted.png
rename : mobile/android/base/resources/drawable-sw600dp-mdpi/tabs_carat.png => mobile/android/base/resources/drawable-sw600dp-mdpi/tabs_carat_contracted.png
rename : mobile/android/base/resources/drawable-sw600dp-xhdpi/tabs_carat.png => mobile/android/base/resources/drawable-sw600dp-xhdpi/tabs_carat_contracted.png
rename : mobile/android/base/resources/drawable-xhdpi-v11/tabs_carat.png => mobile/android/base/resources/drawable-xhdpi-v11/tabs_carat_contracted.png
rename : mobile/android/base/resources/drawable-xlarge-hdpi/tabs_carat.png => mobile/android/base/resources/drawable-xlarge-hdpi/tabs_carat_contracted.png
rename : mobile/android/base/resources/drawable-xlarge-mdpi/tabs_carat.png => mobile/android/base/resources/drawable-xlarge-mdpi/tabs_carat_contracted.png
rename : mobile/android/base/resources/drawable-xlarge-xhdpi/tabs_carat.png => mobile/android/base/resources/drawable-xlarge-xhdpi/tabs_carat_contracted.png
rename : mobile/android/base/resources/drawable/tabs_carat.png => mobile/android/base/resources/drawable/tabs_carat_contracted.png

mobile/android/base/Makefile.in

@@ -382,7 +382,8 @@ RES_DRAWABLE_BASE = \
   res/drawable/tab_close.png \
   res/drawable/tab_thumbnail_default.png \
   res/drawable/tab_thumbnail_shadow.png \
-  res/drawable/tabs_carat.png \
+  res/drawable/tabs_carat_contracted.png \
+  res/drawable/tabs_carat_expanded.png \
   res/drawable/tabs_expanded_normal.png \
   res/drawable/tabs_expanded_pressed.png \
   res/drawable/tabs_normal.png \
@@ -461,7 +462,8 @@ RES_DRAWABLE_HDPI = \
   res/drawable-hdpi/tab_close.png \
   res/drawable-hdpi/tab_thumbnail_default.png \
   res/drawable-hdpi/tab_thumbnail_shadow.png \
-  res/drawable-hdpi/tabs_carat.png \
+  res/drawable-hdpi/tabs_carat_contracted.png \
+  res/drawable-hdpi/tabs_carat_expanded.png \
   res/drawable-hdpi/tabs_expanded_normal.png \
   res/drawable-hdpi/tabs_expanded_pressed.png \
   res/drawable-hdpi/tabs_normal.png \
@@ -568,7 +570,8 @@ RES_DRAWABLE_XHDPI_V11 = \
   res/drawable-xhdpi-v11/tab_close.png \
   res/drawable-xhdpi-v11/tab_thumbnail_default.png \
   res/drawable-xhdpi-v11/tab_thumbnail_shadow.png \
-  res/drawable-xhdpi-v11/tabs_carat.png \
+  res/drawable-xhdpi-v11/tabs_carat_contracted.png \
+  res/drawable-xhdpi-v11/tabs_carat_expanded.png \
   res/drawable-xhdpi-v11/tabs_expanded_normal.png \
   res/drawable-xhdpi-v11/tabs_expanded_pressed.png \
   res/drawable-xhdpi-v11/tabs_normal.png \
@@ -615,7 +618,8 @@ RES_DRAWABLE_LAND_MDPI_V14 = \
   res/drawable-land-mdpi-v14/remote_tabs_off.png \
   res/drawable-land-mdpi-v14/remote_tabs_on.png \
   res/drawable-land-mdpi-v14/tab_new.png \
-  res/drawable-land-mdpi-v14/tabs_carat.png \
+  res/drawable-land-mdpi-v14/tabs_carat_contracted.png \
+  res/drawable-land-mdpi-v14/tabs_carat_expanded.png \
   res/drawable-land-mdpi-v14/tabs_expanded_normal.png \
   res/drawable-land-mdpi-v14/tabs_expanded_pressed.png \
   res/drawable-land-mdpi-v14/tabs_normal.png \
@@ -635,7 +639,8 @@ RES_DRAWABLE_LAND_HDPI_V14 = \
   res/drawable-land-hdpi-v14/remote_tabs_off.png \
   res/drawable-land-hdpi-v14/remote_tabs_on.png \
   res/drawable-land-hdpi-v14/tab_new.png \
-  res/drawable-land-hdpi-v14/tabs_carat.png \
+  res/drawable-land-hdpi-v14/tabs_carat_contracted.png \
+  res/drawable-land-hdpi-v14/tabs_carat_expanded.png \
   res/drawable-land-hdpi-v14/tabs_expanded_normal.png \
   res/drawable-land-hdpi-v14/tabs_expanded_pressed.png \
   res/drawable-land-hdpi-v14/tabs_normal.png \
@@ -655,7 +660,8 @@ RES_DRAWABLE_LAND_XHDPI_V14 = \
   res/drawable-land-xhdpi-v14/remote_tabs_off.png \
   res/drawable-land-xhdpi-v14/remote_tabs_on.png \
   res/drawable-land-xhdpi-v14/tab_new.png \
-  res/drawable-land-xhdpi-v14/tabs_carat.png \
+  res/drawable-land-xhdpi-v14/tabs_carat_contracted.png \
+  res/drawable-land-xhdpi-v14/tabs_carat_expanded.png \
   res/drawable-land-xhdpi-v14/tabs_expanded_normal.png \
   res/drawable-land-xhdpi-v14/tabs_expanded_pressed.png \
   res/drawable-land-xhdpi-v14/tabs_normal.png \
@@ -683,7 +689,8 @@ RES_DRAWABLE_XLARGE_MDPI = \
   res/drawable-xlarge-mdpi/remote_tabs_off.png \
   res/drawable-xlarge-mdpi/remote_tabs_on.png \
   res/drawable-xlarge-mdpi/tab_new.png \
-  res/drawable-xlarge-mdpi/tabs_carat.png \
+  res/drawable-xlarge-mdpi/tabs_carat_contracted.png \
+  res/drawable-xlarge-mdpi/tabs_carat_expanded.png \
   res/drawable-xlarge-mdpi/tabs_expanded_normal.png \
   res/drawable-xlarge-mdpi/tabs_expanded_pressed.png \
   res/drawable-xlarge-mdpi/tabs_normal.png \
@@ -710,7 +717,8 @@ RES_DRAWABLE_XLARGE_HDPI = \
   res/drawable-xlarge-hdpi/remote_tabs_off.png \
   res/drawable-xlarge-hdpi/remote_tabs_on.png \
   res/drawable-xlarge-hdpi/tab_new.png \
-  res/drawable-xlarge-hdpi/tabs_carat.png \
+  res/drawable-xlarge-hdpi/tabs_carat_contracted.png \
+  res/drawable-xlarge-hdpi/tabs_carat_expanded.png \
   res/drawable-xlarge-hdpi/tabs_expanded_normal.png \
   res/drawable-xlarge-hdpi/tabs_expanded_pressed.png \
   res/drawable-xlarge-hdpi/tabs_normal.png \
@@ -737,7 +745,8 @@ RES_DRAWABLE_XLARGE_XHDPI = \
   res/drawable-xlarge-xhdpi/remote_tabs_off.png \
   res/drawable-xlarge-xhdpi/tab_new.png \
   res/drawable-xlarge-xhdpi/remote_tabs_on.png \
-  res/drawable-xlarge-xhdpi/tabs_carat.png \
+  res/drawable-xlarge-xhdpi/tabs_carat_contracted.png \
+  res/drawable-xlarge-xhdpi/tabs_carat_expanded.png \
   res/drawable-xlarge-xhdpi/tabs_expanded_normal.png \
   res/drawable-xlarge-xhdpi/tabs_expanded_pressed.png \
   res/drawable-xlarge-xhdpi/tabs_normal.png \
@@ -765,7 +774,8 @@ RES_DRAWABLE_SW600DP_MDPI = \
   res/drawable-sw600dp-mdpi/remote_tabs_off.png \
   res/drawable-sw600dp-mdpi/remote_tabs_on.png \
   res/drawable-sw600dp-mdpi/tab_new.png \
-  res/drawable-sw600dp-mdpi/tabs_carat.png \
+  res/drawable-sw600dp-mdpi/tabs_carat_contracted.png \
+  res/drawable-sw600dp-mdpi/tabs_carat_expanded.png \
   res/drawable-sw600dp-mdpi/tabs_expanded_normal.png \
   res/drawable-sw600dp-mdpi/tabs_expanded_pressed.png \
   res/drawable-sw600dp-mdpi/tabs_normal.png \
@@ -792,7 +802,8 @@ RES_DRAWABLE_SW600DP_HDPI = \
   res/drawable-sw600dp-hdpi/remote_tabs_off.png \
   res/drawable-sw600dp-hdpi/remote_tabs_on.png \
   res/drawable-sw600dp-hdpi/tab_new.png \
-  res/drawable-sw600dp-hdpi/tabs_carat.png \
+  res/drawable-sw600dp-hdpi/tabs_carat_contracted.png \
+  res/drawable-sw600dp-hdpi/tabs_carat_expanded.png \
   res/drawable-sw600dp-hdpi/tabs_expanded_normal.png \
   res/drawable-sw600dp-hdpi/tabs_expanded_pressed.png \
   res/drawable-sw600dp-hdpi/tabs_normal.png \
@@ -819,7 +830,8 @@ RES_DRAWABLE_SW600DP_XHDPI = \
   res/drawable-sw600dp-xhdpi/remote_tabs_off.png \
   res/drawable-sw600dp-xhdpi/remote_tabs_on.png \
   res/drawable-sw600dp-xhdpi/tab_new.png \
-  res/drawable-sw600dp-xhdpi/tabs_carat.png \
+  res/drawable-sw600dp-xhdpi/tabs_carat_contracted.png \
+  res/drawable-sw600dp-xhdpi/tabs_carat_expanded.png \
   res/drawable-sw600dp-xhdpi/tabs_expanded_normal.png \
   res/drawable-sw600dp-xhdpi/tabs_expanded_pressed.png \
   res/drawable-sw600dp-xhdpi/tabs_normal.png \

mobile/android/base/resources/drawable/tabs_level.xml

@@ -7,16 +7,8 @@
 
     <item android:maxLevel="0" android:drawable="@android:color/transparent"/>
 
-    <item android:maxLevel="1" android:drawable="@drawable/tabs_carat"/>
+    <item android:maxLevel="1" android:drawable="@drawable/tabs_carat_contracted"/>
 
-    <item android:maxLevel="2">
-        <rotate android:drawable="@drawable/tabs_carat"
-                android:fromDegrees="0"
-                android:toDegrees="180"
-                android:pivotX="50%"
-                android:pivotY="50%"
-                android:duration="500"
-                android:interpolator="@android:anim/linear_interpolator"/>
-    </item>
+    <item android:maxLevel="2" android:drawable="@drawable/tabs_carat_expanded"/>
 
 </level-list>

mobile/android/base/resources/layout-land-v14/browser_toolbar.xml

@@ -34,7 +34,6 @@
                      android:background="@drawable/tabs_button"
                      android:gravity="center_vertical"
                      android:src="@drawable/tabs_level"
-                     android:paddingTop="2.5dip"
                      android:paddingLeft="31dip"
                      android:paddingRight="9dip"/>
 
@@ -42,7 +41,7 @@
                      style="@style/AddressBar.ImageButton"
                      android:layout_width="38.5dip"
                      android:layout_height="wrap_content"
-                     android:layout_marginTop="2.5dp"
+                     android:layout_marginTop="4.5dp"
                      android:layout_alignRight="@id/tabs"
                      android:gravity="center_horizontal"/>
 

mobile/android/base/resources/layout-sw600dp/browser_toolbar.xml

@@ -18,15 +18,14 @@
                      android:background="@drawable/tabs_button"
                      android:gravity="center_vertical"
                      android:src="@drawable/tabs_level"
-                     android:paddingTop="6dip"
-                     android:paddingLeft="12dip"
-                     android:paddingRight="44dip"/>
+                     android:paddingLeft="6dip"
+                     android:paddingRight="32dip"/>
 
         <TextSwitcher android:id="@+id/tabs_count"
                      style="@style/AddressBar.ImageButton"
                      android:layout_width="52dip"
                      android:layout_height="wrap_content"
-                     android:layout_marginTop="6dp"
+                     android:layout_marginTop="8dp"
                      android:layout_alignLeft="@id/tabs"
                      android:gravity="center_horizontal"/>
 

mobile/android/base/resources/layout-xlarge/browser_toolbar.xml

@@ -18,15 +18,14 @@
                      android:background="@drawable/tabs_button"
                      android:gravity="center_vertical"
                      android:src="@drawable/tabs_level"
-                     android:paddingTop="6dip"
-                     android:paddingLeft="12dip"
-                     android:paddingRight="44dip"/>
+                     android:paddingLeft="6dip"
+                     android:paddingRight="32dip"/>
 
         <TextSwitcher android:id="@+id/tabs_count"
                      style="@style/AddressBar.ImageButton"
                      android:layout_width="52dip"
                      android:layout_height="wrap_content"
-                     android:layout_marginTop="6dp"
+                     android:layout_marginTop="8dp"
                      android:layout_alignLeft="@id/tabs"
                      android:gravity="center_horizontal"/>
 

mobile/android/base/resources/layout/browser_toolbar.xml

@@ -34,15 +34,14 @@
                      android:background="@drawable/tabs_button"
                      android:gravity="center_vertical"
                      android:src="@drawable/tabs_level"
-                     android:paddingTop="3dip"
                      android:paddingLeft="38dip"
                      android:paddingRight="10dip"/>
 
         <TextSwitcher android:id="@+id/tabs_count"
                      style="@style/AddressBar.ImageButton"
-                     android:layout_width="46dip"
+                     android:layout_width="44.5dip"
                      android:layout_height="wrap_content"
-                     android:layout_marginTop="4dp"
+                     android:layout_marginTop="5dp"
                      android:layout_alignRight="@id/tabs"
                      android:gravity="center_horizontal"/>
 

mobile/android/base/resources/layout/tabs_counter.xml

@@ -9,7 +9,7 @@
           android:textSize="@dimen/tabs_counter_size"
           android:textColor="@color/tabs_counter_color"
           android:gravity="center"
-          android:shadowColor="#000000"
+          android:shadowColor="#7F000000"
           android:shadowRadius="1"
           android:shadowDx="0"
           android:shadowDy="1"/>

mobile/android/base/resources/values-land-v14/dimens.xml

@@ -6,6 +6,6 @@
 <resources>
 
     <dimen name="browser_toolbar_height">40dp</dimen>
-    <dimen name="tabs_counter_size">20sp</dimen>
+    <dimen name="tabs_counter_size">18sp</dimen>
 
 </resources>

mobile/android/base/resources/values-sw600dp/dimens.xml

@@ -6,5 +6,6 @@
 <resources>
 
     <dimen name="browser_toolbar_height">56dp</dimen>
+    <dimen name="tabs_counter_size">26sp</dimen>
 
 </resources>

mobile/android/base/resources/values-v11/dimens.xml

@@ -5,6 +5,6 @@
 
 <resources>
 
-    <dimen name="tabs_counter_size">24sp</dimen>
+    <dimen name="tabs_counter_size">22sp</dimen>
 
 </resources>

mobile/android/base/resources/values-xlarge/dimens.xml

@@ -9,5 +9,6 @@
     <dimen name="local_tab_row_height">150dp</dimen>
     <dimen name="remote_tab_child_row_height">48dp</dimen>
     <dimen name="remote_tab_group_row_height">28dp</dimen>
+    <dimen name="tabs_counter_size">26sp</dimen>
 
 </resources>

mobile/android/base/resources/values/styles.xml

@@ -92,7 +92,7 @@
     <!-- TabsTray Row -->
     <style name="TabRowTextAppearance">
         <item name="android:textColor">#E5F2FF</item>
-        <item name="android:shadowColor">#000000</item>
+        <item name="android:shadowColor">#7F000000</item>
         <item name="android:shadowRadius">1</item>
         <item name="android:shadowDx">0</item>
         <item name="android:shadowDy">1</item>