Bug 1065712 - Move new_tablet_* resources to *large* directories. r=mhaigh
authorMichael Comella <michael.l.comella@gmail.com>
Fri, 12 Sep 2014 18:28:05 -0700
changeset 205164 7d2eec16bbde8ec49ecdb309ec7f932ca9ed9712
parent 205163 881e56c649959f6e2399b6c8e415f64e30a3e34d
child 205165 1b36503ab964bcbd94a94e462856bc352f6a5f0f
push id49106
push userphilringnalda@gmail.com
push dateSat, 13 Sep 2014 17:12:34 +0000
treeherdermozilla-inbound@ab04d0f2665f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmhaigh
bugs1065712
milestone35.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 1065712 - Move new_tablet_* resources to *large* directories. r=mhaigh
mobile/android/base/resources/color-large-v11/new_tablet_tab_strip_item_title.xml
mobile/android/base/resources/color/new_tablet_tab_strip_item_title.xml
mobile/android/base/resources/drawable-hdpi/new_tablet_tabs_count.png
mobile/android/base/resources/drawable-hdpi/new_tablet_tabs_count_foreground.png
mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_tabs_count.png
mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_tabs_count_foreground.png
mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_tabs_count.png
mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_tabs_count_foreground.png
mobile/android/base/resources/drawable-large-v11/new_tablet_tab_strip_divider.xml
mobile/android/base/resources/drawable-large-v11/new_tablet_tab_strip_item_bg.xml
mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_tabs_count.png
mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_tabs_count_foreground.png
mobile/android/base/resources/drawable-mdpi/new_tablet_tabs_count.png
mobile/android/base/resources/drawable-mdpi/new_tablet_tabs_count_foreground.png
mobile/android/base/resources/drawable-xhdpi/new_tablet_tabs_count.png
mobile/android/base/resources/drawable-xhdpi/new_tablet_tabs_count_foreground.png
mobile/android/base/resources/drawable/new_tablet_tab_strip_divider.xml
mobile/android/base/resources/drawable/new_tablet_tab_strip_item_bg.xml
mobile/android/base/resources/layout-large-v11/new_tablet_tab_strip.xml
mobile/android/base/resources/layout-large-v11/new_tablet_tabs_counter.xml
mobile/android/base/resources/layout/new_tablet_tab_strip.xml
mobile/android/base/resources/layout/new_tablet_tabs_counter.xml
mobile/android/base/resources/values-large-v11/styles.xml
mobile/android/base/resources/values/styles.xml
rename from mobile/android/base/resources/color/new_tablet_tab_strip_item_title.xml
rename to mobile/android/base/resources/color-large-v11/new_tablet_tab_strip_item_title.xml
rename from mobile/android/base/resources/drawable-hdpi/new_tablet_tabs_count.png
rename to mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_tabs_count.png
rename from mobile/android/base/resources/drawable-hdpi/new_tablet_tabs_count_foreground.png
rename to mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_tabs_count_foreground.png
rename from mobile/android/base/resources/drawable-mdpi/new_tablet_tabs_count.png
rename to mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_tabs_count.png
rename from mobile/android/base/resources/drawable-mdpi/new_tablet_tabs_count_foreground.png
rename to mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_tabs_count_foreground.png
rename from mobile/android/base/resources/drawable/new_tablet_tab_strip_divider.xml
rename to mobile/android/base/resources/drawable-large-v11/new_tablet_tab_strip_divider.xml
rename from mobile/android/base/resources/drawable/new_tablet_tab_strip_item_bg.xml
rename to mobile/android/base/resources/drawable-large-v11/new_tablet_tab_strip_item_bg.xml
rename from mobile/android/base/resources/drawable-xhdpi/new_tablet_tabs_count.png
rename to mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_tabs_count.png
rename from mobile/android/base/resources/drawable-xhdpi/new_tablet_tabs_count_foreground.png
rename to mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_tabs_count_foreground.png
rename from mobile/android/base/resources/layout/new_tablet_tab_strip.xml
rename to mobile/android/base/resources/layout-large-v11/new_tablet_tab_strip.xml
rename from mobile/android/base/resources/layout/new_tablet_tabs_counter.xml
rename to mobile/android/base/resources/layout-large-v11/new_tablet_tabs_counter.xml
--- a/mobile/android/base/resources/values-large-v11/styles.xml
+++ b/mobile/android/base/resources/values-large-v11/styles.xml
@@ -16,16 +16,21 @@
         <item name="android:layout_centerVertical">true</item>
         <item name="android:src">@drawable/ic_menu_forward</item>
         <item name="android:background">@drawable/url_bar_nav_button</item>
         <!-- Start with the button hidden -->
         <item name="android:alpha">0</item>
         <item name="android:layout_marginLeft">@dimen/forward_default_offset</item>
     </style>
 
+    <style name="UrlBar.ImageButton.TabCount.NewTablet">
+        <item name="android:background">@drawable/new_tablet_tabs_count</item>
+    </style>
+
+
    <style name="UrlBar.Button.Container">
         <item name="android:layout_marginTop">6dp</item>
         <item name="android:layout_marginBottom">6dp</item>
         <!-- Start with forward hidden -->
         <item name="android:orientation">horizontal</item>
     </style>
 
     <style name="TabsList" parent="TabsListBase">
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -403,20 +403,16 @@
 
     <style name="UrlBar.ImageButton.TabCount">
         <item name="android:background">@drawable/tabs_count</item>
         <item name="android:gravity">center_horizontal</item>
         <item name="android:clipChildren">false</item>
         <item name="android:clipToPadding">false</item>
     </style>
 
-    <style name="UrlBar.ImageButton.TabCount.NewTablet">
-        <item name="android:background">@drawable/new_tablet_tabs_count</item>
-    </style>
-
     <!-- URL bar -->
     <style name="UrlBar">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">match_parent</item>
         <item name="android:orientation">horizontal</item>
     </style>
 
     <!-- URL bar - Button -->