Bug 1150742 - Remove new_tablet from ic_menu_reload. r=mhaigh
authorMichael Comella <michael.l.comella@gmail.com>
Tue, 11 Aug 2015 16:40:10 -0700
changeset 257613 60b4ea3f62a2d25db006acc1b451610b833d10bf
parent 257612 afab05b8c71a763842c171ed12f0f9848f31425f
child 257614 0b3494be4783363e9203d53a25fb9db3cb4d1e74
push id14649
push usermichael.l.comella@gmail.com
push dateThu, 13 Aug 2015 17:29:23 +0000
treeherderfx-team@03b4d313d6d6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmhaigh
bugs1150742
milestone43.0a1
Bug 1150742 - Remove new_tablet from ic_menu_reload. r=mhaigh Similar deal to the previous two changesets on back and forward.
mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_reload.png
mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_ic_menu_reload.png
mobile/android/base/resources/drawable-large-v11/ic_menu_reload.xml
mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_reload.png
mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_ic_menu_reload.png
mobile/android/base/resources/drawable-large-xxhdpi-v11/ic_menu_reload.png
mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_ic_menu_reload.png
mobile/android/base/resources/drawable/new_tablet_ic_menu_reload.xml
mobile/android/base/resources/menu-large-v11/browser_app_menu.xml
mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml
rename from mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_ic_menu_reload.png
rename to mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_reload.png
deleted file mode 100644
--- a/mobile/android/base/resources/drawable-large-v11/ic_menu_reload.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"/>
rename from mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_ic_menu_reload.png
rename to mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_reload.png
rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_ic_menu_reload.png
rename to mobile/android/base/resources/drawable-large-xxhdpi-v11/ic_menu_reload.png
deleted file mode 100644
--- a/mobile/android/base/resources/drawable/new_tablet_ic_menu_reload.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"/>
--- a/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml
+++ b/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml
@@ -5,17 +5,17 @@
 
 <!-- We disable AlwaysShowAction because we interpret the menu
      attributes ourselves and thus the warning isn't relevant to us. -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:tools="http://schemas.android.com/tools"
       tools:ignore="AlwaysShowAction">
 
     <item android:id="@+id/reload"
-          android:icon="@drawable/new_tablet_ic_menu_reload"
+          android:icon="@drawable/ic_menu_reload"
           android:title="@string/reload"
           android:showAsAction="always"/>
 
     <item android:id="@+id/back"
           android:icon="@drawable/ic_menu_back"
           android:title="@string/back"
           android:visible="false"/>
 
--- a/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml
+++ b/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml
@@ -5,17 +5,17 @@
 
 <!-- We disable AlwaysShowAction because we interpret the menu
      attributes ourselves and thus the warning isn't relevant to us. -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:tools="http://schemas.android.com/tools"
       tools:ignore="AlwaysShowAction">
 
     <item android:id="@+id/reload"
-          android:icon="@drawable/new_tablet_ic_menu_reload"
+          android:icon="@drawable/ic_menu_reload"
           android:title="@string/reload"
           android:showAsAction="always"/>
 
     <item android:id="@+id/back"
           android:icon="@drawable/ic_menu_back"
           android:title="@string/back"
           android:visible="false"/>