Bug 769237: Remove extra tab carats; rename tab expanded button on phones. [r=mfinkle]

--HG--
rename : mobile/android/base/resources/drawable-hdpi/tabs_expanded_normal.png => mobile/android/base/resources/drawable-hdpi/tabs_button_expanded.png
rename : mobile/android/base/resources/drawable-hdpi/tabs_carat_contracted.png => mobile/android/base/resources/drawable-hdpi/tabs_carat.png
rename : mobile/android/base/resources/drawable-land-hdpi-v14/tabs_expanded_normal.png => mobile/android/base/resources/drawable-land-hdpi-v14/tabs_button_expanded.png
rename : mobile/android/base/resources/drawable-land-hdpi-v14/tabs_carat_contracted.png => mobile/android/base/resources/drawable-land-hdpi-v14/tabs_carat.png
rename : mobile/android/base/resources/drawable-land-mdpi-v14/tabs_expanded_normal.png => mobile/android/base/resources/drawable-land-mdpi-v14/tabs_button_expanded.png
rename : mobile/android/base/resources/drawable-land-mdpi-v14/tabs_carat_contracted.png => mobile/android/base/resources/drawable-land-mdpi-v14/tabs_carat.png
rename : mobile/android/base/resources/drawable-land-xhdpi-v14/tabs_expanded_normal.png => mobile/android/base/resources/drawable-land-xhdpi-v14/tabs_button_expanded.png
rename : mobile/android/base/resources/drawable-land-xhdpi-v14/tabs_carat_contracted.png => mobile/android/base/resources/drawable-land-xhdpi-v14/tabs_carat.png
rename : mobile/android/base/resources/drawable-xhdpi-v11/tabs_expanded_normal.png => mobile/android/base/resources/drawable-xhdpi-v11/tabs_button_expanded.png
rename : mobile/android/base/resources/drawable-xhdpi-v11/tabs_carat_contracted.png => mobile/android/base/resources/drawable-xhdpi-v11/tabs_carat.png
rename : mobile/android/base/resources/drawable/tabs_expanded_normal.png => mobile/android/base/resources/drawable/tabs_button_expanded.png
rename : mobile/android/base/resources/drawable/tabs_carat_contracted.png => mobile/android/base/resources/drawable/tabs_carat.png
extra : rebase_source : 827d43274acb3746a2913bcfe8bcf39f149399bd

mobile/android/base/Makefile.in

@@ -414,9 +414,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_contracted.png \
-  res/drawable/tabs_carat_expanded.png \
-  res/drawable/tabs_expanded_normal.png \
+  res/drawable/tabs_carat.png \
+  res/drawable/tabs_button_expanded.png \
   res/drawable/tabs_normal.png \
   res/drawable/tabs_pressed.png \
   res/drawable/address_bar_back_button.xml \
@@ -496,9 +495,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_contracted.png \
-  res/drawable-hdpi/tabs_carat_expanded.png \
-  res/drawable-hdpi/tabs_expanded_normal.png \
+  res/drawable-hdpi/tabs_carat.png \
+  res/drawable-hdpi/tabs_button_expanded.png \
   res/drawable-hdpi/tabs_normal.png \
   res/drawable-hdpi/tabs_pressed.png \
   res/drawable-hdpi/address_bar_bg_curve.png \
@@ -617,9 +615,8 @@ RES_DRAWABLE_XHDPI_V11 = \
   res/drawable-xhdpi-v11/tab_new_pressed.png \
   res/drawable-xhdpi-v11/tab_thumbnail_default.png \
   res/drawable-xhdpi-v11/tab_thumbnail_shadow.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_carat.png \
+  res/drawable-xhdpi-v11/tabs_button_expanded.png \
   res/drawable-xhdpi-v11/tabs_normal.png \
   res/drawable-xhdpi-v11/tabs_pressed.png \
   res/drawable-xhdpi-v11/address_bar_texture_port.png \
@@ -658,7 +655,7 @@ RES_DRAWABLE_XHDPI_V14 = \
   res/drawable-xhdpi-v14/menu_pressed.png \
   res/drawable-xhdpi-v14/tab_new_normal.png \
   res/drawable-xhdpi-v14/tab_new_pressed.png \
-  res/drawable-xhdpi-v14/tabs_expanded_normal.png \
+  res/drawable-xhdpi-v14/tabs_button_expanded.png \
   res/drawable-xhdpi-v14/tabs_normal.png \
   res/drawable-xhdpi-v14/tabs_pressed.png \
   $(NULL)
@@ -677,9 +674,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_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_carat.png \
+  res/drawable-land-mdpi-v14/tabs_button_expanded.png \
   res/drawable-land-mdpi-v14/tabs_normal.png \
   res/drawable-land-mdpi-v14/tabs_pressed.png \
   res/drawable-land-mdpi-v14/urlbar_stop.png \
@@ -698,9 +694,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_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_carat.png \
+  res/drawable-land-hdpi-v14/tabs_button_expanded.png \
   res/drawable-land-hdpi-v14/tabs_normal.png \
   res/drawable-land-hdpi-v14/tabs_pressed.png \
   res/drawable-land-hdpi-v14/urlbar_stop.png \
@@ -719,9 +714,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_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_carat.png \
+  res/drawable-land-xhdpi-v14/tabs_button_expanded.png \
   res/drawable-land-xhdpi-v14/tabs_normal.png \
   res/drawable-land-xhdpi-v14/tabs_pressed.png \
   res/drawable-land-xhdpi-v14/urlbar_stop.png \
@@ -759,6 +753,7 @@ RES_DRAWABLE_XLARGE_MDPI = \
   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_level.xml \
   res/drawable-xlarge-mdpi/tabs_normal.png \
   res/drawable-xlarge-mdpi/tabs_pressed.png \
   res/drawable-xlarge-mdpi/urlbar_stop.png \
@@ -857,6 +852,7 @@ RES_DRAWABLE_SW600DP_MDPI = \
   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_level.xml \
   res/drawable-sw600dp-mdpi/tabs_normal.png \
   res/drawable-sw600dp-mdpi/tabs_pressed.png \
   res/drawable-sw600dp-mdpi/urlbar_stop.png \
@@ -987,7 +983,6 @@ MOZ_ANDROID_DRAWABLES += \
   mobile/android/base/resources/drawable/tab_new_button.xml                     \
   mobile/android/base/resources/drawable/tabs_button.xml                        \
   mobile/android/base/resources/drawable/tabs_button_contracted.xml             \
-  mobile/android/base/resources/drawable/tabs_button_expanded.xml               \
   mobile/android/base/resources/drawable/tabs_level.xml                         \
   mobile/android/base/resources/drawable/tabs_tray_bg_repeat.xml                \
   mobile/android/base/resources/drawable/tabs_tray_selected_bg_repeat.xml       \

mobile/android/base/resources/drawable-sw600dp-mdpi/tabs_level.xml

@@ -0,0 +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/. -->
+
+<level-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:maxLevel="0" android:drawable="@android:color/transparent"/>
+
+    <item android:maxLevel="1" android:drawable="@drawable/tabs_carat_contracted"/>
+
+    <item android:maxLevel="2" android:drawable="@drawable/tabs_carat_expanded"/>
+
+</level-list>

mobile/android/base/resources/drawable-xlarge-mdpi/tabs_level.xml

@@ -0,0 +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/. -->
+
+<level-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:maxLevel="0" android:drawable="@android:color/transparent"/>
+
+    <item android:maxLevel="1" android:drawable="@drawable/tabs_carat_contracted"/>
+
+    <item android:maxLevel="2" android:drawable="@drawable/tabs_carat_expanded"/>
+
+</level-list>

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

@@ -7,8 +7,6 @@
 
     <item android:maxLevel="0" android:drawable="@android:color/transparent"/>
 
-    <item android:maxLevel="1" android:drawable="@drawable/tabs_carat_contracted"/>
-
-    <item android:maxLevel="2" android:drawable="@drawable/tabs_carat_expanded"/>
+    <item android:maxLevel="1" android:drawable="@drawable/tabs_carat"/>
 
 </level-list>