From 093101013c752f350cf4315078aeeb21fa071d09 Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Tue, 11 Aug 2015 16:32:22 -0700
Subject: [PATCH] Bug 1150742 - Move new_tablet_ic_menu_forward ->
 ic_menu_forward. r=mhaigh

This involved removing drawable-large-v11/ic_menu_forward.xml, which
was a null reference presumably there to save memory when the
browser_app menu loaded the forward menu item. Also, the
new_tablet_ic_menu_forward null reference for API 9 builds was
removed.

--HG--
rename : mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_ic_menu_forward.png => mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_forward.png
rename : mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_ic_menu_forward.png => mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_forward.png
rename : mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_ic_menu_forward.png => mobile/android/base/resources/drawable-large-xxhdpi-v11/ic_menu_forward.png
extra : commitid : CWYwQraUXq0
extra : rebase_source : 5e7773df6166f61748534bd92fa11f6b179b7c9d
---
 ...blet_ic_menu_forward.png => ic_menu_forward.png} | Bin
 .../drawable-large-v11/ic_menu_forward.xml          |   8 --------
 ...blet_ic_menu_forward.png => ic_menu_forward.png} | Bin
 ...blet_ic_menu_forward.png => ic_menu_forward.png} | Bin
 .../drawable/new_tablet_ic_menu_forward.xml         |   7 -------
 .../resources/layout-large-v11/browser_toolbar.xml  |   2 +-
 6 files changed, 1 insertion(+), 16 deletions(-)
 rename mobile/android/base/resources/drawable-large-hdpi-v11/{new_tablet_ic_menu_forward.png => ic_menu_forward.png} (100%)
 delete mode 100644 mobile/android/base/resources/drawable-large-v11/ic_menu_forward.xml
 rename mobile/android/base/resources/drawable-large-xhdpi-v11/{new_tablet_ic_menu_forward.png => ic_menu_forward.png} (100%)
 rename mobile/android/base/resources/drawable-large-xxhdpi-v11/{new_tablet_ic_menu_forward.png => ic_menu_forward.png} (100%)
 delete mode 100644 mobile/android/base/resources/drawable/new_tablet_ic_menu_forward.xml

diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_ic_menu_forward.png b/mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_forward.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_ic_menu_forward.png
rename to mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_forward.png
diff --git a/mobile/android/base/resources/drawable-large-v11/ic_menu_forward.xml b/mobile/android/base/resources/drawable-large-v11/ic_menu_forward.xml
deleted file mode 100644
index 5de7403066f3..000000000000
--- a/mobile/android/base/resources/drawable-large-v11/ic_menu_forward.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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/. -->
-
-<!-- Bug 1106935: Temporary replacement for old tablet resources -->
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@null"/>
diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_ic_menu_forward.png b/mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_forward.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_ic_menu_forward.png
rename to mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_forward.png
diff --git a/mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_ic_menu_forward.png b/mobile/android/base/resources/drawable-large-xxhdpi-v11/ic_menu_forward.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_ic_menu_forward.png
rename to mobile/android/base/resources/drawable-large-xxhdpi-v11/ic_menu_forward.png
diff --git a/mobile/android/base/resources/drawable/new_tablet_ic_menu_forward.xml b/mobile/android/base/resources/drawable/new_tablet_ic_menu_forward.xml
deleted file mode 100644
index d3e7c7917252..000000000000
--- a/mobile/android/base/resources/drawable/new_tablet_ic_menu_forward.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/. -->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@null"/>
diff --git a/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml b/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
index a4a2da50d3ac..4e03a098f5d3 100644
--- a/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
@@ -48,7 +48,7 @@
             android:layout_marginBottom="11.5dp"
             android:layout_gravity="center_vertical"
             android:layout_centerVertical="true"
-            android:src="@drawable/new_tablet_ic_menu_forward"
+            android:src="@drawable/ic_menu_forward"
             android:background="@drawable/new_tablet_url_bar_nav_button"
             android:alpha="0"
             android:layout_width="@dimen/new_tablet_nav_button_width_plus_half"