Bug 1859887 - Refactor ic_private_mode_circle_fill_48 to ui-icons

app/src/main/res/drawable/ic_private_mode_circle_fill_48.xml

@@ -1,18 +0,0 @@
-<!-- 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/. -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:width="48dp"
-    android:height="48dp"
-    android:viewportWidth="48"
-    android:viewportHeight="48"
-    tools:ignore="ExtraText">
-    <path
-        android:fillColor="?privateBrowsingButtonBackground"
-        android:pathData="M24,24m-20,0a20,20 0,1 1,40 0a20,20 0,1 1,-40 0" />
-    <path
-        android:fillColor="?attr/privateBrowsingButtonAccent"
-        android:pathData="M33.914,20.849c0.05,-0.99 -0.62,-1.873 -1.587,-2.093a7.425,7.425 0,0 0,-6.702 1.804l-0.308,0.286a1.939,1.939 0,0 1,-2.643 -0.001l-0.301,-0.28a7.427,7.427 0,0 0,-6.707 -1.808h-0.002a2.043,2.043 0,0 0,-1.584 2.087v0.006c-0.247,0.975 0.134,4.575 0.35,5.141 0.434,2.287 2.303,4.007 4.543,4.007 1.119,0 2.132,-0.447 2.933,-1.161l0.488,-0.418a2.436,2.436 0,0 1,3.139 -0.025l0.734,0.606v-0.003c0.772,0.621 1.718,1.001 2.754,1.001 2.24,0 4.109,-1.72 4.543,-4.007 0.216,-0.567 0.611,-4.152 0.35,-5.142zM21.79,24.69c-0.533,0.603 -1.36,0.991 -2.29,0.991 -0.93,0 -1.757,-0.388 -2.29,-0.991a0.866,0.866 0,0 1,0 -1.131c0.533,-0.603 1.36,-0.991 2.29,-0.991 0.93,0 1.757,0.388 2.29,0.991 0.28,0.317 0.28,0.815 0,1.131zM30.79,24.69c-0.533,0.603 -1.36,0.991 -2.29,0.991 -0.93,0 -1.757,-0.388 -2.29,-0.991a0.866,0.866 0,0 1,0 -1.131c0.533,-0.603 1.36,-0.991 2.29,-0.991 0.93,0 1.757,0.388 2.29,0.991 0.28,0.317 0.28,0.815 0,1.131z"
-        tools:ignore="VectorPath" />
-</vector>

app/src/main/res/layout/fragment_home.xml

@@ -43,7 +43,7 @@
                 android:layout_gravity="end"
                 android:background="?android:attr/selectableItemBackgroundBorderless"
                 android:contentDescription="@string/content_description_private_browsing_button"
-                app:srcCompat="@drawable/ic_private_mode_circle_fill_48"
+                app:srcCompat="@drawable/mozac_ic_private_mode_circle_fill_48"
                 app:layout_collapseMode="parallax"
                 app:layout_collapseParallaxMultiplier=".167"/>
             <!-- This value needs to be 1.67 * the wordmark parallax value as its 24dp vs 40 -->

app/src/main/res/values/attrs.xml

@@ -64,8 +64,6 @@
     <attr name="homeBackground" format="reference"/>
     <attr name="bottomBarBackground" format="reference"/>
     <attr name="bottomBarBackgroundTop" format="reference"/>
-    <attr name="privateBrowsingButtonBackground" format="reference" />
-    <attr name="privateBrowsingButtonAccent" format="reference" />
     <attr name="fenixLogo" format="reference" />
     <attr name="fenixWordmarkText" format="reference" />
     <attr name="fenixWordmarkLogo" format="reference" />

app/src/main/res/values/styles.xml

@@ -129,8 +129,8 @@
         <item name="homeBackground">@color/fx_mobile_layer_color_1</item>
         <item name="bottomBarBackground">@drawable/home_bottom_bar_background</item>
         <item name="bottomBarBackgroundTop">@drawable/home_bottom_bar_background_top</item>
-        <item name="privateBrowsingButtonBackground">@android:color/transparent</item>
-        <item name="privateBrowsingButtonAccent">@color/fx_mobile_text_color_primary</item>
+        <item name="mozac_ic_private_mode_circle_fill_background_color">@android:color/transparent</item>
+        <item name="mozac_ic_private_mode_circle_fill_icon_color">@color/fx_mobile_text_color_primary</item>
 
         <item name="tabCounterTintColor">?attr/textPrimary</item>
     </style>
@@ -320,8 +320,8 @@
         <item name="homeBackground">@drawable/private_home_background_gradient</item>
         <item name="bottomBarBackground">@drawable/private_home_bottom_bar_background_gradient</item>
         <item name="bottomBarBackgroundTop">@drawable/private_home_bottom_bar_background_gradient_top</item>
-        <item name="privateBrowsingButtonBackground">@color/fx_mobile_private_text_color_primary</item>
-        <item name="privateBrowsingButtonAccent">@color/fx_mobile_private_layer_color_1</item>
+        <item name="mozac_ic_private_mode_circle_fill_background_color">@color/photonWhite</item>
+        <item name="mozac_ic_private_mode_circle_fill_icon_color">@color/fx_mobile_private_layer_color_2</item>
 
         <item name="tabCounterTintColor">?attr/textPrimary</item>
     </style>