Bug 1193974 - Remove new from tablet_* dimens. r=mhaigh
authorMichael Comella <michael.l.comella@gmail.com>
Wed, 19 Aug 2015 16:13:08 -0700
changeset 291200 4819bc95cbede50b35710f70f70d83f39cb1f6be
parent 291199 bac57019853ca1228cf0a1dca9b53019e01e1623
child 291201 03cd5896911b3d50233de7c9ae44be4fbeb4ff2b
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_* dimens. r=mhaigh We could remove tablet_* and move these values to the values-large configuration but it's scope creeping for not much gain. The attributes are prepended with tablet_* so they should be easy to fix in the future should we choose to. Refactoring automated w/ Intellij.
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/layout-large-v11/browser_toolbar.xml
mobile/android/base/resources/layout-large-v11/tab_strip_inner.xml
mobile/android/base/resources/layout-large-v11/tab_strip_item.xml
mobile/android/base/resources/layout-large-v11/tabs_panel_back_button.xml
mobile/android/base/resources/layout-v11/tablet_tabs_item_cell.xml
mobile/android/base/resources/layout/gecko_app.xml
mobile/android/base/resources/layout/tabs_panel_default.xml
mobile/android/base/resources/values-land/dimens.xml
mobile/android/base/resources/values-large-v11/styles.xml
mobile/android/base/resources/values-xlarge-land-v11/dimens.xml
mobile/android/base/resources/values-xlarge-v11/dimens.xml
mobile/android/base/resources/values/dimens.xml
mobile/android/base/resources/values/styles.xml
mobile/android/base/tabs/TabStripView.java
mobile/android/base/tabs/TabsGridLayout.java
mobile/android/base/toolbar/BrowserToolbarTablet.java
--- 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
@@ -5,69 +5,69 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
    <item gecko:state_private="true"
          android:state_pressed="true"
          android:state_enabled="true">
 
-        <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">
+        <inset android:insetTop="@dimen/tablet_browser_toolbar_menu_item_inset_vertical"
+               android:insetBottom="@dimen/tablet_browser_toolbar_menu_item_inset_vertical"
+               android:insetLeft="@dimen/tablet_browser_toolbar_menu_item_inset_horizontal"
+               android:insetRight="@dimen/tablet_browser_toolbar_menu_item_inset_horizontal">
             <shape android:shape="rectangle">
                 <solid android:color="@color/text_and_tabs_tray_grey"/>
-                <corners android:radius="@dimen/new_tablet_browser_toolbar_menu_item_corner_radius"/>
+                <corners android:radius="@dimen/tablet_browser_toolbar_menu_item_corner_radius"/>
             </shape>
         </inset>
 
     </item>
 
     <item gecko:state_private="true"
           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">
+        <inset android:insetTop="@dimen/tablet_browser_toolbar_menu_item_inset_vertical"
+               android:insetBottom="@dimen/tablet_browser_toolbar_menu_item_inset_vertical"
+               android:insetLeft="@dimen/tablet_browser_toolbar_menu_item_inset_horizontal"
+               android:insetRight="@dimen/tablet_browser_toolbar_menu_item_inset_horizontal">
             <shape android:shape="rectangle">
                 <solid android:color="@color/placeholder_active_grey"/>
-                <corners android:radius="@dimen/new_tablet_browser_toolbar_menu_item_corner_radius"/>
+                <corners android:radius="@dimen/tablet_browser_toolbar_menu_item_corner_radius"/>
             </shape>
         </inset>
 
     </item>
 
     <item android:state_pressed="true"
           android:state_enabled="true">
 
-        <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">
+        <inset android:insetTop="@dimen/tablet_browser_toolbar_menu_item_inset_vertical"
+               android:insetBottom="@dimen/tablet_browser_toolbar_menu_item_inset_vertical"
+               android:insetLeft="@dimen/tablet_browser_toolbar_menu_item_inset_horizontal"
+               android:insetRight="@dimen/tablet_browser_toolbar_menu_item_inset_horizontal">
             <shape android:shape="rectangle">
                 <solid android:color="@color/toolbar_grey_pressed"/>
-                <corners android:radius="@dimen/new_tablet_browser_toolbar_menu_item_corner_radius"/>
+                <corners android:radius="@dimen/tablet_browser_toolbar_menu_item_corner_radius"/>
             </shape>
         </inset>
 
     </item>
 
     <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">
+        <inset android:insetTop="@dimen/tablet_browser_toolbar_menu_item_inset_vertical"
+               android:insetBottom="@dimen/tablet_browser_toolbar_menu_item_inset_vertical"
+               android:insetLeft="@dimen/tablet_browser_toolbar_menu_item_inset_horizontal"
+               android:insetRight="@dimen/tablet_browser_toolbar_menu_item_inset_horizontal">
             <shape android:shape="rectangle">
                 <solid android:color="@color/tablet_highlight_focused"/>
-                <corners android:radius="@dimen/new_tablet_browser_toolbar_menu_item_corner_radius"/>
+                <corners android:radius="@dimen/tablet_browser_toolbar_menu_item_corner_radius"/>
             </shape>
         </inset>
 
     </item>
 
     <item>
         <shape android:shape="rectangle">
             <solid android:color="@android:color/transparent"/>
--- a/mobile/android/base/resources/drawable-large-v11/tab_strip_button.xml
+++ b/mobile/android/base/resources/drawable-large-v11/tab_strip_button.xml
@@ -4,38 +4,38 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
     <item android:state_pressed="true"
           android:state_enabled="true">
 
-        <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">
+        <inset android:insetTop="@dimen/tablet_tab_strip_button_inset"
+               android:insetBottom="@dimen/tablet_tab_strip_button_inset"
+               android:insetLeft="@dimen/tablet_tab_strip_button_inset"
+               android:insetRight="@dimen/tablet_tab_strip_button_inset">
             <shape android:shape="rectangle">
                 <solid android:color="@color/highlight_dark"/>
-                <corners android:radius="@dimen/new_tablet_browser_toolbar_menu_item_corner_radius"/>
+                <corners android:radius="@dimen/tablet_browser_toolbar_menu_item_corner_radius"/>
             </shape>
         </inset>
 
     </item>
 
     <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">
+        <inset android:insetTop="@dimen/tablet_tab_strip_button_inset"
+               android:insetBottom="@dimen/tablet_tab_strip_button_inset"
+               android:insetLeft="@dimen/tablet_tab_strip_button_inset"
+               android:insetRight="@dimen/tablet_tab_strip_button_inset">
             <shape android:shape="rectangle">
                 <solid android:color="@color/tablet_highlight_focused"/>
-                <corners android:radius="@dimen/new_tablet_browser_toolbar_menu_item_corner_radius"/>
+                <corners android:radius="@dimen/tablet_browser_toolbar_menu_item_corner_radius"/>
             </shape>
         </inset>
 
     </item>
 
     <item>
         <shape android:shape="rectangle">
             <solid android:color="@android:color/transparent"/>
--- a/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
@@ -6,17 +6,17 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
     <ImageView android:id="@+id/url_bar_entry"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:layout_alignLeft="@+id/back"
                android:layout_toLeftOf="@id/menu_items"
-               android:layout_marginLeft="@dimen/new_tablet_nav_button_width_half"
+               android:layout_marginLeft="@dimen/tablet_nav_button_width_half"
                android:layout_marginTop="10dp"
                android:layout_marginBottom="10dp"
                android:duplicateParentState="true"
                android:clickable="false"
                android:focusable="false"
                android:background="@drawable/url_bar_entry"/>
 
     <!-- The attributes statically defined here are for the expanded
@@ -46,24 +46,24 @@
             android:paddingBottom="0dp"
             android:layout_marginTop="11.5dp"
             android:layout_marginBottom="11.5dp"
             android:layout_gravity="center_vertical"
             android:layout_centerVertical="true"
             android:src="@drawable/ic_menu_forward"
             android:background="@drawable/url_bar_nav_button"
             android:alpha="0"
-            android:layout_width="@dimen/new_tablet_nav_button_width_plus_half"
-            android:layout_marginLeft="@dimen/new_tablet_nav_button_width_half"
+            android:layout_width="@dimen/tablet_nav_button_width_plus_half"
+            android:layout_marginLeft="@dimen/tablet_nav_button_width_half"
             android:paddingLeft="18dp"/>
 
     <org.mozilla.gecko.toolbar.BackButton android:id="@id/back"
                                           style="@style/UrlBar.ImageButton"
-                                          android:layout_width="@dimen/new_tablet_nav_button_width"
-                                          android:layout_height="@dimen/new_tablet_nav_button_width"
+                                          android:layout_width="@dimen/tablet_nav_button_width"
+                                          android:layout_height="@dimen/tablet_nav_button_width"
                                           android:layout_centerVertical="true"
                                           android:layout_marginLeft="12dp"
                                           android:layout_alignParentLeft="true"
                                           android:src="@drawable/ic_menu_back"
                                           android:contentDescription="@string/back"
                                           android:background="@drawable/url_bar_nav_button"/>
 
     <org.mozilla.gecko.toolbar.ToolbarEditLayout android:id="@+id/edit_layout"
--- a/mobile/android/base/resources/layout-large-v11/tab_strip_inner.xml
+++ b/mobile/android/base/resources/layout-large-v11/tab_strip_inner.xml
@@ -12,15 +12,15 @@
         android:layout_weight="1"
         android:paddingTop="8dp"/>
 
     <!-- The right margin creates a "dead area" on the right side of the button
          which we compensate for with a touch delegate. See TabStrip -->
     <org.mozilla.gecko.widget.ThemedImageButton
         android:id="@+id/add_tab"
         style="@style/UrlBar.ImageButton"
-        android:layout_width="@dimen/new_tablet_tab_strip_height"
+        android:layout_width="@dimen/tablet_tab_strip_height"
         android:src="@drawable/tab_strip_add_tab"
         android:contentDescription="@string/new_tab"
         android:layout_marginRight="9dp"
         android:background="@drawable/tab_strip_button"/>
 
 </merge>
--- a/mobile/android/base/resources/layout-large-v11/tab_strip_item.xml
+++ b/mobile/android/base/resources/layout-large-v11/tab_strip_item.xml
@@ -2,12 +2,12 @@
 <!-- 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/. -->
 
 <!-- The paddings are asymmetric here to compensate the padding around the
      the close button within the TabStripItemView -->
 <org.mozilla.gecko.tabs.TabStripItemView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/new_tablet_tab_strip_item_width"
+    android:layout_width="@dimen/tablet_tab_strip_item_width"
     android:layout_height="match_parent"
     android:paddingLeft="28dp"
     android:paddingRight="12dp"/>
--- a/mobile/android/base/resources/layout-large-v11/tabs_panel_back_button.xml
+++ b/mobile/android/base/resources/layout-large-v11/tabs_panel_back_button.xml
@@ -7,11 +7,11 @@
                                            xmlns:gecko="http://schemas.android.com/apk/res-auto"
                                            android:id="@+id/nav_back"
                                            android:layout_width="@dimen/tabs_panel_button_width"
                                            android:layout_height="match_parent"
                                            android:minWidth="@dimen/tabs_panel_button_width"
                                            android:src="@drawable/tabs_panel_nav_back"
                                            android:contentDescription="@string/back"
                                            android:background="@drawable/action_bar_button_inverse"
-                                           gecko:dividerVerticalPadding="@dimen/new_tablet_tab_panel_divider_vertical_padding"
+                                           gecko:dividerVerticalPadding="@dimen/tablet_tab_panel_divider_vertical_padding"
                                            gecko:rightDivider="@drawable/tab_indicator_divider"/>
 
--- a/mobile/android/base/resources/layout-v11/tablet_tabs_item_cell.xml
+++ b/mobile/android/base/resources/layout-v11/tablet_tabs_item_cell.xml
@@ -11,19 +11,19 @@
                                            android:layout_height="wrap_content"
                                            android:gravity="center"
                                            android:orientation="vertical">
 
     <LinearLayout android:layout_width="fill_parent"
                   android:layout_height="wrap_content"
                   android:orientation="horizontal"
                   android:duplicateParentState="true"
-                  android:paddingLeft="@dimen/new_tablet_tab_highlight_stroke_width"
-                  android:paddingRight="@dimen/new_tablet_tab_highlight_stroke_width"
-                  android:paddingBottom="@dimen/new_tablet_tab_highlight_stroke_width">
+                  android:paddingLeft="@dimen/tablet_tab_highlight_stroke_width"
+                  android:paddingRight="@dimen/tablet_tab_highlight_stroke_width"
+                  android:paddingBottom="@dimen/tablet_tab_highlight_stroke_width">
 
        <org.mozilla.gecko.widget.FadedSingleColorTextView
                android:id="@+id/title"
                android:layout_width="0dip"
                android:layout_height="wrap_content"
                android:layout_weight="1.0"
                style="@style/TabLayoutItemTextAppearance"
                android:textSize="14sp"
@@ -57,20 +57,20 @@
 
     </LinearLayout>
 
     <!-- We set state_private on this View dynamically in TabsGridLayout. -->
     <org.mozilla.gecko.widget.TabThumbnailWrapper
             android:id="@+id/wrapper"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="@dimen/new_tablet_tab_highlight_stroke_width"
+            android:padding="@dimen/tablet_tab_highlight_stroke_width"
             android:background="@drawable/tab_thumbnail"
             android:duplicateParentState="true">
 
         <org.mozilla.gecko.widget.ThumbnailView android:id="@+id/thumbnail"
-                                                android:layout_width="@dimen/new_tablet_tab_thumbnail_width"
-                                                android:layout_height="@dimen/new_tablet_tab_thumbnail_height"
+                                                android:layout_width="@dimen/tablet_tab_thumbnail_width"
+                                                android:layout_height="@dimen/tablet_tab_thumbnail_height"
                                                 />
 
     </org.mozilla.gecko.widget.TabThumbnailWrapper>
 
 </org.mozilla.gecko.tabs.TabsLayoutItemView>
--- a/mobile/android/base/resources/layout/gecko_app.xml
+++ b/mobile/android/base/resources/layout/gecko_app.xml
@@ -97,17 +97,17 @@
                       android:layout_width="match_parent"
                       android:layout_height="wrap_content"
                       android:orientation="vertical">
 
             <ViewStub android:id="@+id/new_tablet_tab_strip"
                       android:inflatedId="@id/new_tablet_tab_strip"
                       android:layout="@layout/tab_strip"
                       android:layout_width="match_parent"
-                      android:layout_height="@dimen/new_tablet_tab_strip_height"
+                      android:layout_height="@dimen/tablet_tab_strip_height"
                       android:visibility="gone"/>
 
             <org.mozilla.gecko.widget.GeckoViewFlipper
                 android:id="@+id/browser_actionbar"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/browser_toolbar_height_flipper"
                 android:clickable="true"
                 android:focusable="true">
--- a/mobile/android/base/resources/layout/tabs_panel_default.xml
+++ b/mobile/android/base/resources/layout/tabs_panel_default.xml
@@ -23,17 +23,17 @@
                       android:layout_width="wrap_content"
                       android:layout_height="match_parent"/>
 
             <org.mozilla.gecko.widget.IconTabWidget android:id="@+id/tab_widget"
                                                     android:layout_width="wrap_content"
                                                     android:layout_height="match_parent"
                                                     android:tabStripEnabled="false"
                                                     android:divider="@drawable/tab_indicator_divider"
-                                                    android:dividerPadding="@dimen/new_tablet_tab_panel_divider_vertical_padding"
+                                                    android:dividerPadding="@dimen/tablet_tab_panel_divider_vertical_padding"
                                                     android:layout="@layout/tabs_panel_indicator"/>
 
             <View android:layout_width="0dip"
                   android:layout_height="match_parent"
                   android:layout_weight="1.0"/>
 
             <ImageButton android:id="@+id/add_tab"
                          style="@style/UrlBar.ImageButton"
--- a/mobile/android/base/resources/values-land/dimens.xml
+++ b/mobile/android/base/resources/values-land/dimens.xml
@@ -4,10 +4,10 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <resources>
 
     <!-- Remote Tabs static view top padding. Less in landscape on phones. -->
     <dimen name="home_remote_tabs_top_padding">16dp</dimen>
     <dimen name="page_group_height">64dp</dimen>
 
-    <dimen name="new_tablet_tab_panel_grid_padding">48dp</dimen>
+    <dimen name="tablet_tab_panel_grid_padding">48dp</dimen>
 </resources>
--- a/mobile/android/base/resources/values-large-v11/styles.xml
+++ b/mobile/android/base/resources/values-large-v11/styles.xml
@@ -1,17 +1,17 @@
 <?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/. -->
 
 <resources>
 
     <style name="UrlBar.ImageButton" parent="UrlBar.ImageButtonBase">
-        <item name="android:layout_width">@dimen/new_tablet_browser_toolbar_menu_item_width</item>
+        <item name="android:layout_width">@dimen/tablet_browser_toolbar_menu_item_width</item>
     </style>
 
     <style name="UrlBar.ImageButton.TabCount">
         <item name="android:background">@drawable/tabs_count</item>
     </style>
 
     <style name="UrlBar.Button.Container">
         <item name="android:layout_marginTop">6dp</item>
@@ -49,18 +49,18 @@
         <!-- layout_width/height doesn't work here, likely because it's
              an ImageButton, so we use padding instead.
 
              Notes:
                  * The bookmarks star is larger than the reload button
                  * The reload button contains whitespace at the top of the image to lower it -->
         <item name="android:paddingTop">19dp</item>
         <item name="android:paddingBottom">21dp</item>
-        <item name="android:paddingLeft">@dimen/new_tablet_browser_toolbar_menu_item_padding_horizontal</item>
-        <item name="android:paddingRight">@dimen/new_tablet_browser_toolbar_menu_item_padding_horizontal</item>
+        <item name="android:paddingLeft">@dimen/tablet_browser_toolbar_menu_item_padding_horizontal</item>
+        <item name="android:paddingRight">@dimen/tablet_browser_toolbar_menu_item_padding_horizontal</item>
     </style>
 
     <style name="Widget.MenuItemSecondaryActionBar" parent="Widget.MenuItemSecondaryActionBarBase">
         <item name="drawableTintList">@color/action_bar_secondary_menu_item_colors</item>
     </style>
 
     <style name="Widget.BookmarksListView" parent="Widget.HomeListView">
         <item name="android:scrollbarStyle">outsideOverlay</item>
--- a/mobile/android/base/resources/values-xlarge-land-v11/dimens.xml
+++ b/mobile/android/base/resources/values-xlarge-land-v11/dimens.xml
@@ -1,10 +1,10 @@
 <?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/. -->
 
 <resources>
 
-    <dimen name="new_tablet_tab_panel_grid_padding">64dp</dimen>
+    <dimen name="tablet_tab_panel_grid_padding">64dp</dimen>
 
 </resources>
--- a/mobile/android/base/resources/values-xlarge-v11/dimens.xml
+++ b/mobile/android/base/resources/values-xlarge-v11/dimens.xml
@@ -1,11 +1,11 @@
 <?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/. -->
 
 <resources>
 
     <dimen name="panel_grid_view_column_width">250dp</dimen>
-    <dimen name="new_tablet_tab_panel_grid_padding">48dp</dimen>
+    <dimen name="tablet_tab_panel_grid_padding">48dp</dimen>
 
 </resources>
--- a/mobile/android/base/resources/values/dimens.xml
+++ b/mobile/android/base/resources/values/dimens.xml
@@ -23,35 +23,35 @@
     <dimen name="browser_toolbar_icon_width">48dp</dimen>
 
     <!-- favicon_size includes 4dp of right padding. We can't use margin (which would allow us to
          specify the actual size) because that would decrease the size of our hit target. -->
     <dimen name="browser_toolbar_favicon_size">21.33dip</dimen>
     <dimen name="browser_toolbar_shadow_size">2dp</dimen>
 
     <!-- If you update one of these values, update the others. -->
-    <dimen name="new_tablet_nav_button_width">42dp</dimen>
-    <dimen name="new_tablet_nav_button_width_half">21dp</dimen>
-    <dimen name="new_tablet_nav_button_width_plus_half">63dp</dimen>
+    <dimen name="tablet_nav_button_width">42dp</dimen>
+    <dimen name="tablet_nav_button_width_half">21dp</dimen>
+    <dimen name="tablet_nav_button_width_plus_half">63dp</dimen>
 
     <!-- This is the system default for the vertical padding for the divider of the TabWidget.
          Used to mimic the divider padding on the tablet tabs panel back button. -->
-    <dimen name="new_tablet_tab_panel_divider_vertical_padding">12dp</dimen>
+    <dimen name="tablet_tab_panel_divider_vertical_padding">12dp</dimen>
 
-    <dimen name="new_tablet_tab_strip_height">48dp</dimen>
-    <dimen name="new_tablet_tab_strip_item_width">208dp</dimen>
-    <dimen name="new_tablet_tab_strip_item_margin">-28dp</dimen>
-    <dimen name="new_tablet_tab_strip_fading_edge_size">15dp</dimen>
-    <dimen name="new_tablet_browser_toolbar_menu_item_width">56dp</dimen>
+    <dimen name="tablet_tab_strip_height">48dp</dimen>
+    <dimen name="tablet_tab_strip_item_width">208dp</dimen>
+    <dimen name="tablet_tab_strip_item_margin">-28dp</dimen>
+    <dimen name="tablet_tab_strip_fading_edge_size">15dp</dimen>
+    <dimen name="tablet_browser_toolbar_menu_item_width">56dp</dimen>
     <!-- Padding combines with an 18dp image to form the menu item width and height. -->
-    <dimen name="new_tablet_browser_toolbar_menu_item_padding_horizontal">19dp</dimen>
-    <dimen name="new_tablet_browser_toolbar_menu_item_inset_vertical">5dp</dimen>
-    <dimen name="new_tablet_browser_toolbar_menu_item_inset_horizontal">3dp</dimen>
-    <dimen name="new_tablet_browser_toolbar_menu_item_corner_radius">5dp</dimen>
-    <dimen name="new_tablet_tab_strip_button_inset">5dp</dimen>
+    <dimen name="tablet_browser_toolbar_menu_item_padding_horizontal">19dp</dimen>
+    <dimen name="tablet_browser_toolbar_menu_item_inset_vertical">5dp</dimen>
+    <dimen name="tablet_browser_toolbar_menu_item_inset_horizontal">3dp</dimen>
+    <dimen name="tablet_browser_toolbar_menu_item_corner_radius">5dp</dimen>
+    <dimen name="tablet_tab_strip_button_inset">5dp</dimen>
 
     <!-- Dimensions used by Favicons and FaviconView -->
     <dimen name="favicon_bg">32dp</dimen>
     <!-- Set the upper limit on the size of favicon that will be processed. Favicons larger than
          this will be downscaled to this value. If you need to use larger Favicons (Due to a UI
          redesign sometime after this is written) you should increase this value to the largest
          commonly-used size of favicon and, performance permitting, fetch the remainder from the
          database. The largest available size is always stored in the database, regardless of this
@@ -140,24 +140,24 @@
     <dimen name="tabs_strip_shadow_size">1dp</dimen>
     <dimen name="tabs_layout_horizontal_height">156dp</dimen>
     <dimen name="text_selection_handle_width">47dp</dimen>
     <dimen name="text_selection_handle_height">58dp</dimen>
     <dimen name="text_selection_handle_shadow">11dp</dimen>
     <dimen name="validation_message_height">50dp</dimen>
     <dimen name="validation_message_margin_top">6dp</dimen>
 
-    <dimen name="new_tablet_tab_thumbnail_width">168dp</dimen>
-    <dimen name="new_tablet_tab_thumbnail_height">140dp</dimen>
-    <dimen name="new_tablet_tab_panel_column_width">178dp</dimen>
-    <dimen name="new_tablet_tab_panel_grid_padding">19dp</dimen>
-    <dimen name="new_tablet_tab_panel_grid_vspacing">21dp</dimen>
-    <dimen name="new_tablet_tab_panel_grid_padding_top">24dp</dimen>
+    <dimen name="tablet_tab_thumbnail_width">168dp</dimen>
+    <dimen name="tablet_tab_thumbnail_height">140dp</dimen>
+    <dimen name="tablet_tab_panel_column_width">178dp</dimen>
+    <dimen name="tablet_tab_panel_grid_padding">19dp</dimen>
+    <dimen name="tablet_tab_panel_grid_vspacing">21dp</dimen>
+    <dimen name="tablet_tab_panel_grid_padding_top">24dp</dimen>
 
-    <dimen name="new_tablet_tab_highlight_stroke_width">5dp</dimen>
+    <dimen name="tablet_tab_highlight_stroke_width">5dp</dimen>
 
     <!-- PageActionButtons dimensions -->
     <dimen name="page_action_button_width">32dp</dimen>
 
     <!-- Banner -->
     <dimen name="home_banner_height">72dp</dimen>
     <dimen name="home_banner_close_width">42dp</dimen>
     <dimen name="home_banner_icon_height">48dip</dimen>
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -203,19 +203,19 @@
     <style name="Widget.TabsGridLayout" parent="Widget.GridView">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">match_parent</item>
         <item name="android:paddingTop">0dp</item>
         <item name="android:stretchMode">spacingWidth</item>
         <item name="android:scrollbarStyle">outsideOverlay</item>
         <item name="android:gravity">center</item>
         <item name="android:numColumns">auto_fit</item>
-        <item name="android:columnWidth">@dimen/new_tablet_tab_panel_column_width</item>
+        <item name="android:columnWidth">@dimen/tablet_tab_panel_column_width</item>
         <item name="android:horizontalSpacing">2dp</item>
-        <item name="android:verticalSpacing">@dimen/new_tablet_tab_panel_grid_vspacing</item>
+        <item name="android:verticalSpacing">@dimen/tablet_tab_panel_grid_vspacing</item>
         <item name="android:drawSelectorOnTop">true</item>
         <item name="android:clipToPadding">false</item>
     </style>
 
     <style name="Widget.BookmarkItemView" parent="Widget.TwoLinePageRow"/>
 
     <style name="Widget.BookmarksListView" parent="Widget.HomeListView"/>
 
--- a/mobile/android/base/tabs/TabStripView.java
+++ b/mobile/android/base/tabs/TabStripView.java
@@ -65,24 +65,24 @@ public class TabStripView extends TwoWay
         setWillNotDraw(false);
 
         final Resources resources = getResources();
 
         divider = resources.getDrawable(R.drawable.tab_strip_divider);
         divider.getPadding(dividerPadding);
 
         final int itemMargin =
-                resources.getDimensionPixelSize(R.dimen.new_tablet_tab_strip_item_margin);
+                resources.getDimensionPixelSize(R.dimen.tablet_tab_strip_item_margin);
         setItemMargin(itemMargin);
 
         animatorListener = new TabAnimatorListener();
 
         fadingEdgePaint = new Paint();
         fadingEdgeSize =
-                resources.getDimensionPixelOffset(R.dimen.new_tablet_tab_strip_fading_edge_size);
+                resources.getDimensionPixelOffset(R.dimen.tablet_tab_strip_fading_edge_size);
 
         adapter = new TabStripAdapter(context);
         setAdapter(adapter);
     }
 
     private View getViewForTab(Tab tab) {
         final int position = adapter.getPositionForTab(tab);
         return getChildAt(position - getFirstVisiblePosition());
--- a/mobile/android/base/tabs/TabsGridLayout.java
+++ b/mobile/android/base/tabs/TabsGridLayout.java
@@ -83,20 +83,20 @@ class TabsGridLayout extends GridView
             }
         });
 
         // The clipToPadding setting in the styles.xml doesn't seem to be working (bug 1101784)
         // so lets set it manually in code for the moment as it's needed for the padding animation
         setClipToPadding(false);
 
         final Resources resources = getResources();
-        mColumnWidth = resources.getDimensionPixelSize(R.dimen.new_tablet_tab_panel_column_width);
+        mColumnWidth = resources.getDimensionPixelSize(R.dimen.tablet_tab_panel_column_width);
 
-        final int padding = resources.getDimensionPixelSize(R.dimen.new_tablet_tab_panel_grid_padding);
-        final int paddingTop = resources.getDimensionPixelSize(R.dimen.new_tablet_tab_panel_grid_padding_top);
+        final int padding = resources.getDimensionPixelSize(R.dimen.tablet_tab_panel_grid_padding);
+        final int paddingTop = resources.getDimensionPixelSize(R.dimen.tablet_tab_panel_grid_padding_top);
 
         // Lets set double the top padding on the bottom so that the last row shows up properly!
         // Your demise, GridView, cannot come fast enough.
         final int paddingBottom = paddingTop * 2;
 
         setPadding(padding, paddingTop, padding, paddingBottom);
 
         setOnItemClickListener(new OnItemClickListener() {
@@ -137,17 +137,17 @@ class TabsGridLayout extends GridView
         final boolean oneItemOnLastRow = (lastPosition % numberOfColumns == 0);
         if (firstChildOffScreen && lastChildVisible && oneItemOnLastRow) {
             // We need to set the view's bottom padding to prevent a sudden jump as the
             // last item in the row is being removed. We then need to remove the padding
             // via a sweet animation
 
             final int removedHeight = getChildAt(0).getMeasuredHeight();
             final int verticalSpacing =
-                    getResources().getDimensionPixelOffset(R.dimen.new_tablet_tab_panel_grid_vspacing);
+                    getResources().getDimensionPixelOffset(R.dimen.tablet_tab_panel_grid_vspacing);
 
             ValueAnimator paddingAnimator = ValueAnimator.ofInt(getPaddingBottom() + removedHeight + verticalSpacing, getPaddingBottom());
             paddingAnimator.setDuration(ANIM_TIME_MS * 2);
 
             paddingAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
 
                 @Override
                 public void onAnimationUpdate(ValueAnimator animation) {
--- a/mobile/android/base/toolbar/BrowserToolbarTablet.java
+++ b/mobile/android/base/toolbar/BrowserToolbarTablet.java
@@ -31,17 +31,17 @@ class BrowserToolbarTablet extends Brows
     private ForwardButtonState forwardButtonState;
 
     private boolean backButtonWasEnabledOnStartEditing;
 
     public BrowserToolbarTablet(final Context context, final AttributeSet attrs) {
         super(context, attrs);
 
         forwardButtonTranslationWidth =
-                getResources().getDimensionPixelOffset(R.dimen.new_tablet_nav_button_width);
+                getResources().getDimensionPixelOffset(R.dimen.tablet_nav_button_width);
 
         // The forward button is initially expanded (in the layout file)
         // so translate it for start of the expansion animation; future
         // iterations translate it to this position when hiding and will already be set up.
         ViewHelper.setTranslationX(forwardButton, -forwardButtonTranslationWidth);
 
         // TODO: Move this to *TabletBase when old tablet is removed.
         // We don't want users clicking the forward button in transitions, but we don't want it to