From 25cabbbde2f10a84637b4b322a258f8cabd9e9fb Mon Sep 17 00:00:00 2001 From: Michael Comella Date: Tue, 11 Aug 2015 17:33:05 -0700 Subject: [PATCH] Bug 1150742 - Remove new from tablet_tab_close. r=mhaigh tablet_* is not ideal but there is a collision between phone and tablet assets so I filed bug 1193585 to complete this process. --HG-- rename : mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_tab_close.png => mobile/android/base/resources/drawable-large-hdpi-v11/tablet_tab_close.png rename : mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_tab_close_active.png => mobile/android/base/resources/drawable-large-hdpi-v11/tablet_tab_close_active.png rename : mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_tab_close.png => mobile/android/base/resources/drawable-large-xhdpi-v11/tablet_tab_close.png rename : mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_tab_close_active.png => mobile/android/base/resources/drawable-large-xhdpi-v11/tablet_tab_close_active.png rename : mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_tab_close.png => mobile/android/base/resources/drawable-large-xxhdpi-v11/tablet_tab_close.png rename : mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_tab_close_active.png => mobile/android/base/resources/drawable-large-xxhdpi-v11/tablet_tab_close_active.png extra : commitid : LWgCmYlShK3 extra : rebase_source : 3ffb229ec8331fe5f6a67ba15efbb307756d6f36 --- ...ew_tablet_tab_close.png => tablet_tab_close.png} | Bin ...close_active.png => tablet_tab_close_active.png} | Bin .../new_tablet_tab_item_close_button.xml | 6 +++--- ...ew_tablet_tab_close.png => tablet_tab_close.png} | Bin ...close_active.png => tablet_tab_close_active.png} | Bin ...ew_tablet_tab_close.png => tablet_tab_close.png} | Bin ...close_active.png => tablet_tab_close_active.png} | Bin .../layout-large-v11/tab_strip_item_view.xml | 2 +- 8 files changed, 4 insertions(+), 4 deletions(-) rename mobile/android/base/resources/drawable-large-hdpi-v11/{new_tablet_tab_close.png => tablet_tab_close.png} (100%) rename mobile/android/base/resources/drawable-large-hdpi-v11/{new_tablet_tab_close_active.png => tablet_tab_close_active.png} (100%) rename mobile/android/base/resources/drawable-large-xhdpi-v11/{new_tablet_tab_close.png => tablet_tab_close.png} (100%) rename mobile/android/base/resources/drawable-large-xhdpi-v11/{new_tablet_tab_close_active.png => tablet_tab_close_active.png} (100%) rename mobile/android/base/resources/drawable-large-xxhdpi-v11/{new_tablet_tab_close.png => tablet_tab_close.png} (100%) rename mobile/android/base/resources/drawable-large-xxhdpi-v11/{new_tablet_tab_close_active.png => tablet_tab_close_active.png} (100%) diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_tab_close.png b/mobile/android/base/resources/drawable-large-hdpi-v11/tablet_tab_close.png similarity index 100% rename from mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_tab_close.png rename to mobile/android/base/resources/drawable-large-hdpi-v11/tablet_tab_close.png diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_tab_close_active.png b/mobile/android/base/resources/drawable-large-hdpi-v11/tablet_tab_close_active.png similarity index 100% rename from mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_tab_close_active.png rename to mobile/android/base/resources/drawable-large-hdpi-v11/tablet_tab_close_active.png diff --git a/mobile/android/base/resources/drawable-large-v11/new_tablet_tab_item_close_button.xml b/mobile/android/base/resources/drawable-large-v11/new_tablet_tab_item_close_button.xml index 7c3572f70a5f..94c56c68ef5c 100644 --- a/mobile/android/base/resources/drawable-large-v11/new_tablet_tab_item_close_button.xml +++ b/mobile/android/base/resources/drawable-large-v11/new_tablet_tab_item_close_button.xml @@ -7,12 +7,12 @@ + android:drawable="@drawable/tablet_tab_close_active"/> + android:drawable="@drawable/tablet_tab_close_active"/> - + diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_tab_close.png b/mobile/android/base/resources/drawable-large-xhdpi-v11/tablet_tab_close.png similarity index 100% rename from mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_tab_close.png rename to mobile/android/base/resources/drawable-large-xhdpi-v11/tablet_tab_close.png diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_tab_close_active.png b/mobile/android/base/resources/drawable-large-xhdpi-v11/tablet_tab_close_active.png similarity index 100% rename from mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_tab_close_active.png rename to mobile/android/base/resources/drawable-large-xhdpi-v11/tablet_tab_close_active.png diff --git a/mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_tab_close.png b/mobile/android/base/resources/drawable-large-xxhdpi-v11/tablet_tab_close.png similarity index 100% rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_tab_close.png rename to mobile/android/base/resources/drawable-large-xxhdpi-v11/tablet_tab_close.png diff --git a/mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_tab_close_active.png b/mobile/android/base/resources/drawable-large-xxhdpi-v11/tablet_tab_close_active.png similarity index 100% rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_tab_close_active.png rename to mobile/android/base/resources/drawable-large-xxhdpi-v11/tablet_tab_close_active.png diff --git a/mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml b/mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml index 95864c858cb5..9c263294b19e 100644 --- a/mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml +++ b/mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml @@ -46,7 +46,7 @@ android:background="@android:color/transparent" android:scaleType="center" android:contentDescription="@string/close_tab" - android:src="@drawable/new_tablet_tab_close" + android:src="@drawable/tablet_tab_close" android:duplicateParentState="true"/>