Adapt the incognito icon in the incognito interstitial for dark mode.

This CL uses adaptive colors for the incognito filled icon in the
incognito interstitial. It uses modern_grey_300 for dark mode and
modern_grey_800 for light mode.

Screenshot: crbug.com/1137339#c4
Bug: 1137339
Change-Id: I659faac43841c27007b54e85e194e816e1648826
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2468116Reviewed-by: Theresa  <twellington@chromium.org>
Reviewed-by: Lijin Shen <lazzzis@google.com>
Reviewed-by: Alice Wang <aliceywang@chromium.org>
Commit-Queue: Rohit Agarwal <roagarwal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#820223}

chrome/android/chrome_java_resources.gni

@@ -691,6 +691,7 @@ chrome_java_resources = [
   "java/res/drawable/ic_image_descriptions.xml",
   "java/res/drawable/ic_incognito_24dp.xml",
   "java/res/drawable/ic_incognito_cct_24dp.xml",
+  "java/res/drawable/ic_incognito_filled_24dp.xml",
   "java/res/drawable/ic_logo_googleg_20dp.xml",
   "java/res/drawable/ic_loop_round.xml",
   "java/res/drawable/ic_music_note_24dp.xml",

chrome/android/java/res/drawable/ic_incognito_filled_24dp.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2020 The Chromium Authors. All rights reserved.
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file. -->
+
+<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="M8.48,17.2C9.5515,17.2 10.42,16.3314 10.42,15.26C10.42,14.1886 9.5515,13.32 8.48,13.32C7.4086,13.32 6.54,14.1886 6.54,15.26C6.54,16.3314 7.4086,17.2 8.48,17.2Z"
+        android:fillColor="@color/incognito_icon_filled_bg_color"/>
+    <path
+        android:pathData="M12,1C5.92,1 1,5.92 1,12C1,18.08 5.92,23 12,23C18.08,23 23,18.08 23,12C23,5.92 18.08,1 12,1ZM9.38,5.51C9.53,5.12 9.95,4.91 10.35,5.05L11.97,5.59L13.58,5.05C13.97,4.92 14.4,5.13 14.55,5.51L16.32,10.23H7.62L9.38,5.51V5.51ZM15.45,17.97C14.03,17.97 12.89,16.88 12.76,15.49C12.01,15.01 11.4,15.31 11.16,15.47C11.1081,16.1477 10.8021,16.7808 10.3033,17.2425C9.8045,17.7042 9.1497,17.9605 8.47,17.96C6.98,17.96 5.76,16.74 5.76,15.25C5.76,13.76 6.98,12.54 8.47,12.54C9.75,12.54 10.82,13.43 11.1,14.63C11.55,14.44 12.15,14.36 12.8,14.64C12.9375,14.0448 13.2721,13.5134 13.7495,13.1323C14.2269,12.7511 14.8191,12.5424 15.43,12.54C16.92,12.54 18.14,13.76 18.14,15.25C18.1455,15.6062 18.0798,15.9599 17.9469,16.2904C17.8141,16.6209 17.6166,16.9216 17.3661,17.1748C17.1156,17.4281 16.8172,17.6289 16.4882,17.7654C16.1591,17.902 15.8062,17.9715 15.45,17.97ZM18.94,11.78H5V11H18.94V11.78V11.78Z"
+        android:fillColor="@color/incognito_icon_filled_bg_color"/>
+    <path
+        android:pathData="M15.4498,17.2C16.5212,17.2 17.3898,16.3314 17.3898,15.26C17.3898,14.1886 16.5212,13.32 15.4498,13.32C14.3783,13.32 13.5098,14.1886 13.5098,15.26C13.5098,16.3314 14.3783,17.2 15.4498,17.2Z"
+        android:fillColor="@color/incognito_icon_filled_bg_color"/>
+</vector>

chrome/android/java/src/org/chromium/chrome/browser/signin/account_picker/AccountPickerBottomSheetView.java

@@ -192,7 +192,7 @@ class AccountPickerBottomSheetView implements BottomSheetContent {
     }
 
     void setUpIncognitoInterstitialView() {
-        mLogoImage.setImageResource(R.drawable.location_bar_incognito_badge);
+        mLogoImage.setImageResource(R.drawable.ic_incognito_filled_24dp);
         mAccountPickerTitle.setText(R.string.incognito_interstitial_title);
         mIncognitoInterstitialView.setVisibility(View.VISIBLE);
 

ui/android/java/res/values-night/colors.xml

@@ -66,6 +66,9 @@
         @color/circular_progress_icon_color_small_large_dark
     </color>
 
+    <!-- Incognito icon colors -->
+    <color name="incognito_icon_filled_bg_color">@color/incognito_icon_filled_bg_color_light</color>
+
     <!-- Other colors -->
     <color name="default_red">@color/default_red_light</color>
     <color name="default_green">@color/default_green_light</color>

ui/android/java/res/values/semantic_colors_adaptive.xml

@@ -102,6 +102,9 @@
         @color/circular_progress_icon_color_small_large_light
     </color>
 
+    <!-- Incognito icon colors -->
+    <color name="incognito_icon_filled_bg_color">@color/incognito_icon_filled_bg_color_dark</color>
+
     <!-- Other colors -->
     <color name="default_red" tools:ignore="UnusedResources">@color/default_red_dark</color>
     <color name="default_green" tools:ignore="UnusedResources">@color/default_green_dark</color>

ui/android/java/res/values/semantic_colors_non_adaptive.xml

@@ -110,8 +110,12 @@
     <color name="image_loading_color_dark">@color/modern_grey_300</color>
     <color name="image_loading_color_light">@color/white_alpha_12</color>
 
-    <!-- Illustration -->
+    <!-- Incognito icon colors -->
+    <color name="incognito_icon_filled_bg_color_dark">@color/modern_grey_800</color>
+    <color name="incognito_icon_filled_bg_color_light">@color/modern_grey_300</color>
     <color name="ntp_incognito_icon_color" tools:ignore="UnusedResources">@color/modern_grey_300</color>
+
+    <!-- Illustration -->
     <color name="drag_handlebar_color">@color/modern_grey_300</color>
     <color name="promo_illustration_bg_color_light">@color/modern_grey_100_alpha_38</color>
     <color name="promo_illustration_bg_color_dark">@color/modern_grey_800_alpha_38</color>