From 44125bc4c9388659357208ce9cbf75ec46479dcc Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Thu, 18 Apr 2019 14:27:06 -0700
Subject: [PATCH] [fenix] Closes
 https://github.com/mozilla-mobile/fenix/issues/1784 - Make separate private
 vector without background

---
 .../main/res/drawable/ic_private_browsing.xml | 32 +++++--------------
 .../res/drawable/private_browsing_button.xml  | 29 +++++++++++++++++
 .../private_browsing_button_background.xml    | 19 -----------
 app/src/main/res/layout/fragment_home.xml     |  2 +-
 4 files changed, 38 insertions(+), 44 deletions(-)
 create mode 100644 app/src/main/res/drawable/private_browsing_button.xml
 delete mode 100644 app/src/main/res/drawable/private_browsing_button_background.xml

diff --git a/app/src/main/res/drawable/ic_private_browsing.xml b/app/src/main/res/drawable/ic_private_browsing.xml
index ea9570edba..4ee2bc80c6 100644
--- a/app/src/main/res/drawable/ic_private_browsing.xml
+++ b/app/src/main/res/drawable/ic_private_browsing.xml
@@ -2,28 +2,12 @@
 <!-- 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/. -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-<item>
-  <shape android:shape="oval">
-    <size
-            android:width="40dp"
-            android:height="40dp" />
-    <solid android:color="?privateBrowsingButtonBackground" />
-  </shape>
-</item>
-<item
-        android:bottom="8dp"
-        android:left="8dp"
-        android:right="8dp"
-        android:top="8dp">
-  <vector xmlns:android="http://schemas.android.com/apk/res/android"
-          android:width="24dp"
-          android:height="24dp"
-          android:viewportWidth="24"
-          android:viewportHeight="24">
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-            android:pathData="M17.5,17c-2.1,0 -3.5,-2.5 -5.5,-2.5S8.4,17 6.5,17C3.9,17 2,14.6 2,10.4 2,7.8 2.8,7 6.1,7s4.3,1.4 5.9,1.4c1.6,0 2.6,-1.4 5.9,-1.4 3.3,0 4.1,0.8 4.1,3.4 0,4.2 -1.9,6.6 -4.5,6.6zM7.7,10.2c-2,0.1 -2.9,1.3 -2.9,1.6 0,0.3 1.3,1.1 2.7,1.1 1.3,0 2.9,-0.5 2.9,-0.9 0,-0.5 -0.8,-1.9 -2.7,-1.8zM16.3,10.2c-1.9,-0.1 -2.7,1.3 -2.7,1.8 0,0.4 1.5,0.9 2.9,0.9s2.7,-0.8 2.7,-1.1c-0.1,-0.3 -0.9,-1.5 -2.9,-1.6z"
-            android:fillColor="?privateBrowsingButtonAccent" />
-  </vector>
-</item>
-</layer-list>
\ No newline at end of file
+        android:fillColor="?attr/primaryText"
+        android:pathData="M17.5,17c-2.1,0 -3.5,-2.5 -5.5,-2.5S8.4,17 6.5,17C3.9,17 2,14.6 2,10.4 2,7.8 2.8,7 6.1,7s4.3,1.4 5.9,1.4c1.6,0 2.6,-1.4 5.9,-1.4 3.3,0 4.1,0.8 4.1,3.4 0,4.2 -1.9,6.6 -4.5,6.6zM7.7,10.2c-2,0.1 -2.9,1.3 -2.9,1.6 0,0.3 1.3,1.1 2.7,1.1 1.3,0 2.9,-0.5 2.9,-0.9 0,-0.5 -0.8,-1.9 -2.7,-1.8zM16.3,10.2c-1.9,-0.1 -2.7,1.3 -2.7,1.8 0,0.4 1.5,0.9 2.9,0.9s2.7,-0.8 2.7,-1.1c-0.1,-0.3 -0.9,-1.5 -2.9,-1.6z" />
+</vector>
diff --git a/app/src/main/res/drawable/private_browsing_button.xml b/app/src/main/res/drawable/private_browsing_button.xml
new file mode 100644
index 0000000000..e55d21ef2d
--- /dev/null
+++ b/app/src/main/res/drawable/private_browsing_button.xml
@@ -0,0 +1,29 @@
+<?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/. -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <size
+                android:width="40dp"
+                android:height="40dp" />
+            <solid android:color="?privateBrowsingButtonBackground" />
+        </shape>
+    </item>
+    <item
+        android:bottom="8dp"
+        android:left="8dp"
+        android:right="8dp"
+        android:top="8dp">
+        <vector
+            android:width="24dp"
+            android:height="24dp"
+            android:viewportWidth="24"
+            android:viewportHeight="24">
+            <path
+                android:fillColor="?attr/privateBrowsingButtonAccent"
+                android:pathData="M17.5,17c-2.1,0 -3.5,-2.5 -5.5,-2.5S8.4,17 6.5,17C3.9,17 2,14.6 2,10.4 2,7.8 2.8,7 6.1,7s4.3,1.4 5.9,1.4c1.6,0 2.6,-1.4 5.9,-1.4 3.3,0 4.1,0.8 4.1,3.4 0,4.2 -1.9,6.6 -4.5,6.6zM7.7,10.2c-2,0.1 -2.9,1.3 -2.9,1.6 0,0.3 1.3,1.1 2.7,1.1 1.3,0 2.9,-0.5 2.9,-0.9 0,-0.5 -0.8,-1.9 -2.7,-1.8zM16.3,10.2c-1.9,-0.1 -2.7,1.3 -2.7,1.8 0,0.4 1.5,0.9 2.9,0.9s2.7,-0.8 2.7,-1.1c-0.1,-0.3 -0.9,-1.5 -2.9,-1.6z" />
+        </vector>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/drawable/private_browsing_button_background.xml b/app/src/main/res/drawable/private_browsing_button_background.xml
deleted file mode 100644
index 86e02f14ad..0000000000
--- a/app/src/main/res/drawable/private_browsing_button_background.xml
+++ /dev/null
@@ -1,19 +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/. -->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="?android:attr/colorControlHighlight">
-    <item android:id="@android:id/mask">
-        <shape>
-            <solid android:color="?accentBright" />
-            <corners android:radius="32dp" />
-        </shape>
-    </item>
-    <item>
-        <shape>
-            <solid android:color="?accentBright" />
-            <corners android:radius="32dp" />
-        </shape>
-    </item>
-</ripple>
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 9c96007bfb..e08d902685 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -31,7 +31,7 @@
             android:layout_width="@dimen/glyph_button_height"
             android:layout_height="@dimen/glyph_button_height"
             android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:src="@drawable/ic_private_browsing"
+            android:src="@drawable/private_browsing_button"
             android:contentDescription="@string/content_description_private_browsing_button"
             app:layout_constraintEnd_toStartOf="@id/menuButton"
             app:layout_constraintTop_toTopOf="@id/menuButton" />