Bug 1148550 - Remove add_tab private browsing and dark assets. r=mhaigh
authorMichael Comella <michael.l.comella@gmail.com>
Tue, 25 Aug 2015 15:18:54 -0700
changeset 292986 bcccb8af005d7d83aecc584709a10c6f3ee032f7
parent 292985 eb04d3293fed7a207a039496591a2c45d7bac474
child 292987 33817a41e2e17ee5d86c27048df4feb39a24eda4
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
bugs1148550
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 1148550 - Remove add_tab private browsing and dark assets. r=mhaigh Replace dark assets with tinting.
mobile/android/base/resources/color-large-v11/tab_new_tab_strip_colors.xml
mobile/android/base/resources/drawable-hdpi/tab_new_pb.png
mobile/android/base/resources/drawable-large-hdpi-v11/tab_new_dark.png
mobile/android/base/resources/drawable-large-v11/tab_strip_add_tab.xml
mobile/android/base/resources/drawable-large-xhdpi-v11/tab_new_dark.png
mobile/android/base/resources/drawable-xhdpi/tab_new_pb.png
mobile/android/base/resources/drawable/tab_new_level.xml
mobile/android/base/resources/layout-large-v11/tab_strip_inner.xml
mobile/android/base/resources/layout/tabs_panel_default.xml
mobile/android/base/tabs/TabsPanel.java
new file mode 100644
--- /dev/null
+++ b/mobile/android/base/resources/color-large-v11/tab_new_tab_strip_colors.xml
@@ -0,0 +1,14 @@
+<?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/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+    <item gecko:state_light="true"
+          android:color="@color/toolbar_icon_grey"/>
+
+    <item android:color="@color/tabs_tray_icon_grey"/>
+
+</selector>
\ No newline at end of file
deleted file mode 100644
index 9cf91adb9521b578451399625e4e2baff637d63b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 3033f6d397e6c1cf103dd5525935b7308ef2b269..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/mobile/android/base/resources/drawable-large-v11/tab_strip_add_tab.xml
+++ /dev/null
@@ -1,17 +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/. -->
-
-<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:drawable="@drawable/tab_new_pb"/>
-
-    <item gecko:state_light="true"
-          android:drawable="@drawable/tab_new_dark"/>
-
-    <item android:drawable="@drawable/tab_new"/>
-
-</selector>
deleted file mode 100644
index bf5ec993d3a251c5f9e909a2c164401b46317923..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 41daa5591b5c1406a852f6c9d66925676dca643b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/mobile/android/base/resources/drawable/tab_new_level.xml
+++ /dev/null
@@ -1,12 +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/. -->
-
-<level-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:maxLevel="0" android:drawable="@drawable/tab_new"/>
-
-    <item android:maxLevel="1" android:drawable="@drawable/tab_new_pb"/>
-
-</level-list>
--- a/mobile/android/base/resources/layout-large-v11/tab_strip_inner.xml
+++ b/mobile/android/base/resources/layout-large-v11/tab_strip_inner.xml
@@ -1,26 +1,28 @@
 <?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/. -->
 
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
     <org.mozilla.gecko.tabs.TabStripView
         android:id="@+id/tab_strip"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         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.themed.ThemedImageButton
         android:id="@+id/add_tab"
         style="@style/UrlBar.ImageButton"
         android:layout_width="@dimen/tablet_tab_strip_height"
-        android:src="@drawable/tab_strip_add_tab"
+        android:src="@drawable/tab_new"
+        gecko:drawableTintList="@color/tab_new_tab_strip_colors"
         android:contentDescription="@string/new_tab"
         android:layout_marginRight="9dp"
         android:background="@drawable/tab_strip_button"/>
 
 </merge>
--- a/mobile/android/base/resources/layout/tabs_panel_default.xml
+++ b/mobile/android/base/resources/layout/tabs_panel_default.xml
@@ -34,17 +34,17 @@
             <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"
                          android:layout_width="@dimen/tabs_panel_button_width"
                          android:padding="@dimen/browser_toolbar_button_padding"
-                         android:src="@drawable/tab_new_level"
+                         android:src="@drawable/tab_new"
                          android:contentDescription="@string/new_tab"
                          android:background="@drawable/action_bar_button_inverse"/>
 
             <FrameLayout android:id="@+id/menu"
                          style="@style/UrlBar.ImageButton"
                          android:layout_width="@dimen/tabs_panel_button_width"
                          android:background="@drawable/action_bar_button_inverse"
                          android:contentDescription="@string/menu"
--- a/mobile/android/base/tabs/TabsPanel.java
+++ b/mobile/android/base/tabs/TabsPanel.java
@@ -367,17 +367,16 @@ public class TabsPanel extends LinearLay
                 break;
 
             default:
                 throw new IllegalArgumentException("Unknown panel type " + panelToShow);
         }
         mPanel.show();
 
         mAddTab.setVisibility(View.VISIBLE);
-        mAddTab.setImageLevel(index);
 
         if (!HardwareUtils.hasMenuButton()) {
             mMenuButton.setVisibility(View.VISIBLE);
             mMenuButton.setEnabled(true);
             mPopupMenu.setAnchor(mMenuButton);
         } else {
             mPopupMenu.setAnchor(mAddTab);
         }