Bug 1150742 - Remove new_tablet from url_bar_nav_button. r=mhaigh
authorMichael Comella <michael.l.comella@gmail.com>
Tue, 11 Aug 2015 17:24:44 -0700
changeset 257678 bbd328d0fbc0ee47e799fdc96ff9935c435c0303
parent 257677 6e268d8977668c3aaf1e496aa041b441827aaab2
child 257679 8219c4f711ddaf3dbfcac4b085ffb8a892ee51ea
push id29225
push userkwierso@gmail.com
push dateThu, 13 Aug 2015 23:31:33 +0000
treeherdermozilla-central@4e883591bb5d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmhaigh
bugs1150742
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 1150742 - Remove new_tablet from url_bar_nav_button. r=mhaigh
mobile/android/base/resources/drawable-large-v11/new_tablet_url_bar_nav_button.xml
mobile/android/base/resources/drawable-large-v11/url_bar_nav_button.xml
mobile/android/base/resources/drawable/new_tablet_url_bar_nav_button.xml
mobile/android/base/resources/drawable/url_bar_nav_button.xml
mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
mobile/android/base/toolbar/NavButton.java
rename from mobile/android/base/resources/drawable-large-v11/new_tablet_url_bar_nav_button.xml
rename to mobile/android/base/resources/drawable-large-v11/url_bar_nav_button.xml
rename from mobile/android/base/resources/drawable/new_tablet_url_bar_nav_button.xml
rename to mobile/android/base/resources/drawable/url_bar_nav_button.xml
--- a/mobile/android/base/resources/drawable/new_tablet_url_bar_nav_button.xml
+++ b/mobile/android/base/resources/drawable/url_bar_nav_button.xml
@@ -1,7 +1,9 @@
 <?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/. -->
 
+<!-- This asset is properly available in large-* dirs so this null
+     reference exists for build time on API 9 builds. -->
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
         android:src="@null"/>
--- a/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
@@ -44,32 +44,32 @@
             android:layout_height="match_parent"
             android:paddingTop="0dp"
             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/new_tablet_url_bar_nav_button"
+            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:paddingLeft="18dp"/>
 
     <org.mozilla.gecko.toolbar.BackButton android:id="@id/back"
                                           style="@style/UrlBar.ImageButton.NewTablet"
                                           android:layout_width="@dimen/new_tablet_nav_button_width"
                                           android:layout_height="@dimen/new_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/new_tablet_url_bar_nav_button"/>
+                                          android:background="@drawable/url_bar_nav_button"/>
 
     <org.mozilla.gecko.toolbar.ToolbarEditLayout android:id="@+id/edit_layout"
                   style="@style/UrlBar.Button"
                   android:paddingLeft="10dp"
                   android:paddingRight="12dp"
                   android:visibility="gone"
                   android:orientation="horizontal"
                   android:layout_toRightOf="@id/back"
--- a/mobile/android/base/toolbar/NavButton.java
+++ b/mobile/android/base/toolbar/NavButton.java
@@ -53,17 +53,17 @@ abstract class NavButton extends ShapedB
     @Override
     public void draw(Canvas canvas) {
         super.draw(canvas);
 
         // Draw the border on top.
         canvas.drawPath(mBorderPath, mBorderPaint);
     }
 
-    // The drawable is constructed as per @drawable/new_tablet_url_bar_nav_button.
+    // The drawable is constructed as per @drawable/url_bar_nav_button.
     @Override
     public void onLightweightThemeChanged() {
         final Drawable drawable = BrowserToolbar.getLightweightThemeDrawable(this, getTheme(), R.color.toolbar_grey);
 
         if (drawable == null) {
             return;
         }
 
@@ -75,11 +75,11 @@ abstract class NavButton extends ShapedB
         stateList.addState(PRIVATE_STATE_SET, getColorDrawable(R.color.tabs_tray_grey_pressed));
         stateList.addState(EMPTY_STATE_SET, drawable);
 
         setBackgroundDrawable(stateList);
     }
 
     @Override
     public void onLightweightThemeReset() {
-        setBackgroundResource(R.drawable.new_tablet_url_bar_nav_button);
+        setBackgroundResource(R.drawable.url_bar_nav_button);
     }
 }