Bug 1148550 - Remove add_tab private browsing and dark assets. r=mhaigh

Replace dark assets with tinting.

--HG--
extra : commitid : F1VtUJmQJfm
extra : rebase_source : 08494cfb3619a3fef337d907e72e0cc02ab3417e

mobile/android/base/resources/color-large-v11/tab_new_tab_strip_colors.xml

@@ -6,12 +6,9 @@
 <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"/>
+          android:color="@color/toolbar_icon_grey"/>
 
-    <item android:drawable="@drawable/tab_new"/>
+    <item android:color="@color/tabs_tray_icon_grey"/>
 
-</selector>
+</selector>

mobile/android/base/resources/drawable/tab_new_level.xml

@@ -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>

mobile/android/base/resources/layout-large-v11/tab_strip_inner.xml

@@ -3,7 +3,8 @@
    - 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"
@@ -18,7 +19,8 @@
         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"/>

mobile/android/base/resources/layout/tabs_panel_default.xml

@@ -39,7 +39,7 @@
                          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"/>
 

mobile/android/base/tabs/TabsPanel.java

@@ -372,7 +372,6 @@ public class TabsPanel extends LinearLayout
         mPanel.show();
 
         mAddTab.setVisibility(View.VISIBLE);
-        mAddTab.setImageLevel(index);
 
         if (!HardwareUtils.hasMenuButton()) {
             mMenuButton.setVisibility(View.VISIBLE);