[Dark] Fix offline and play icon color on NTP

Bug: 957262
Change-Id: I53e0b5e05d630a8f6dece614f1dc6be8666ed429
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1589056
Commit-Queue: Becky Zhou <huayinz@chromium.org>
Reviewed-by: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#658714}

chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedImageLoader.java

@@ -143,9 +143,13 @@ public class FeedImageLoader implements ImageLoaderApi {
     private @DrawableRes int lookupDrawableIdentifier(String resourceName) {
         switch (resourceName) {
             case BundledAssets.OFFLINE_INDICATOR_BADGE:
-                return R.drawable.offline_pin_round;
+                return R.drawable.ic_offline_pin_24dp_on_light_bg;
+            case BundledAssets.OFFLINE_INDICATOR_BADGE_DARK_BG:
+                return R.drawable.ic_offline_pin_24dp_on_dark_bg;
             case BundledAssets.VIDEO_INDICATOR_BADGE:
-                return R.drawable.ic_play_circle_filled_grey;
+                return R.drawable.ic_play_circle_filled_24dp_on_light_bg;
+            case BundledAssets.VIDEO_INDICATOR_BADGE_DARK_BG:
+                return R.drawable.ic_play_circle_filled_24dp_on_dark_bg;
         }
 
         return 0;

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

@@ -13,13 +13,13 @@
   <path
       android:pathData="M31.7987,13.7962C32.597,15.3095 33.1187,17.0012 33.2803,18.8095C33.9387,26.1295 28.5137,32.6245 21.192,33.2795C13.872,33.9378 7.3787,28.5128 6.722,21.1912C6.0637,13.8712 11.4887,7.3762 18.8103,6.7212C21.547,6.4745 24.167,7.0812 26.412,8.3162L29.1687,6.0978C26.1303,4.0895 22.4203,3.0495 18.5103,3.4012C9.3487,4.2228 2.5787,12.3262 3.4003,21.4895C4.2237,30.6528 12.327,37.4228 21.4903,36.6012C30.6537,35.7778 37.4237,27.6745 36.6003,18.5112C36.3303,15.4945 35.2587,12.7445 33.6303,10.4312L31.7987,13.7962Z"
       android:strokeWidth="1"
-      android:fillColor="@color/light_icon_color"
+      android:fillColor="@color/default_icon_color_secondary"
       android:fillType="evenOdd"
       android:strokeColor="#00000000"/>
   <path
       android:pathData="M17.6515,22.3508C18.2765,22.9775 19.1248,23.3292 20.0098,23.3275C20.8948,23.3275 21.7432,22.9758 22.3682,22.3492L31.7982,8.1975L17.6515,17.6342C17.0248,18.2608 16.6732,19.1092 16.6732,19.9925C16.6732,20.8775 17.0265,21.7258 17.6515,22.3508"
       android:strokeWidth="1"
-      android:fillColor="@color/light_icon_color"
+      android:fillColor="@color/default_icon_color_secondary"
       android:fillType="evenOdd"
       android:strokeColor="#00000000"/>
 </vector>

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

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2019 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"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:targetApi="21"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group>
+    <clip-path android:pathData="M0,0h24v24H0V0z M 0,0"/>
+    <path
+        android:pathData="M12 2C6.5 2 2 6.5 2 12s4.5 10 10 10 10,-4.5 10,-10S17.5 2 12 2zm5 16H7v-2h10v2zm-6.7,-4L7 10.7l1.4,-1.4 1.9 1.9 5.3,-5.3L17 7.3 10.3 14z"
+        android:fillColor="@color/default_icon_color_secondary"/>
+  </group>
+</vector>

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

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2019 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"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:targetApi="21"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group>
+    <clip-path android:pathData="M0,0h24v24H0V0z M 0,0"/>
+    <path
+        android:pathData="M12 2C6.5 2 2 6.5 2 12s4.5 10 10 10 10,-4.5 10,-10S17.5 2 12 2zm5 16H7v-2h10v2zm-6.7,-4L7 10.7l1.4,-1.4 1.9 1.9 5.3,-5.3L17 7.3 10.3 14z"
+        android:fillColor="@color/default_icon_color_secondary_light"/>
+  </group>
+</vector>

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

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2019 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"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:targetApi="21"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group>
+    <clip-path android:pathData="M0,0h24v24H0V0z M 0,0"/>
+    <path
+        android:pathData="M12 2C6.5 2 2 6.5 2 12s4.5 10 10 10 10,-4.5 10,-10S17.5 2 12 2zm5 16H7v-2h10v2zm-6.7,-4L7 10.7l1.4,-1.4 1.9 1.9 5.3,-5.3L17 7.3 10.3 14z"
+        android:fillColor="@color/default_icon_color_secondary_dark"/>
+  </group>
+</vector>

chrome/android/java/res/drawable/ic_play_circle_filled_grey.xml → chrome/android/java/res/drawable/ic_play_circle_filled_24dp.xml

@@ -16,7 +16,7 @@
         android:fillColor="@android:color/transparent"
         android:pathData="M 6,6 H 18 V 18 H 6 z" />
     <path
-        android:fillColor="#757575"
+        android:fillColor="@color/default_icon_color_secondary"
         android:pathData="M 12,2 C 6.475,2 2,6.475 2,12 2,17.525 6.475,22 12,22 17.525,22 22,17.525
             22,12 22,6.475 17.525,2 12,2 z M 9.9999998,16.5 v -9 L 16,12 9.9999998,16.5 z" />
 </vector>

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

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2018 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. -->
+
+<!-- Note: hand-tweaked for foreground and background colors, not canonical icon. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:targetApi="21"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/transparent"
+        android:pathData="M 6,6 H 18 V 18 H 6 z" />
+    <path
+        android:fillColor="@color/default_icon_color_secondary_light"
+        android:pathData="M 12,2 C 6.475,2 2,6.475 2,12 2,17.525 6.475,22 12,22 17.525,22 22,17.525
+            22,12 22,6.475 17.525,2 12,2 z M 9.9999998,16.5 v -9 L 16,12 9.9999998,16.5 z" />
+</vector>

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

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2018 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. -->
+
+<!-- Note: hand-tweaked for foreground and background colors, not canonical icon. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:targetApi="21"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/transparent"
+        android:pathData="M 6,6 H 18 V 18 H 6 z" />
+    <path
+        android:fillColor="@color/default_icon_color_secondary_dark"
+        android:pathData="M 12,2 C 6.475,2 2,6.475 2,12 2,17.525 6.475,22 12,22 17.525,22 22,17.525
+            22,12 22,6.475 17.525,2 12,2 z M 9.9999998,16.5 v -9 L 16,12 9.9999998,16.5 z" />
+</vector>

chrome/android/java/res/layout/content_suggestions_card_modern_reversed.xml

@@ -83,9 +83,9 @@
                     android:layout_width="@dimen/snippets_offline_icon_size"
                     android:layout_height="@dimen/snippets_offline_icon_size"
                     android:layout_marginStart="6dp"
-                    android:src="@drawable/offline_pin_round"
                     android:contentDescription="@string/accessibility_ntp_offline_badge"
                     android:visibility="gone"
+                    app:srcCompat="@drawable/ic_offline_pin_24dp"
                     tools:tint="@color/default_icon_color" />
 
                 <ImageView
@@ -95,8 +95,8 @@
                     android:layout_marginStart="6dp"
                     android:contentDescription="@string/accessibility_suggestion_with_video_badge"
                     android:visibility="gone"
-                    app:srcCompat="@drawable/ic_play_circle_filled_grey"
-                    tools:src="@drawable/ic_play_circle_filled_grey" />
+                    app:srcCompat="@drawable/ic_play_circle_filled_24dp"
+                    tools:src="@drawable/ic_play_circle_filled_24dp" />
             </LinearLayout>
         </LinearLayout>
 

chrome/android/java/res/layout/history_item_view.xml

@@ -20,7 +20,7 @@
             style="@style/ListItemEndIconSmall"
             android:contentDescription="@string/remove"
             android:src="@drawable/btn_delete_24dp"
-            app:tint="@color/light_icon_color" />
+            app:tint="@color/default_icon_color_secondary" />
     </LinearLayout>
 
 </org.chromium.chrome.browser.history.HistoryItemView>
\ No newline at end of file

chrome/android/java/res/layout/selectable_list_layout.xml

@@ -47,7 +47,7 @@
                 android:drawablePadding="3dp"
                 android:visibility="gone"
                 android:textAppearance="@style/TextAppearance.BlackDisabledText1"
-                app:chromeDrawableTint="@color/light_icon_color"/>
+                app:chromeDrawableTint="@color/default_icon_color_secondary"/>
         </FrameLayout>
 
         <org.chromium.chrome.browser.widget.LoadingView

chrome/android/java/res_download/layout/download_manager_prefetch_item.xml

@@ -92,8 +92,8 @@
         android:layout_width="12dp"
         android:layout_height="12dp"
         android:layout_marginStart="4dp"
-        android:src="@drawable/offline_pin_round"
         android:scaleType="centerInside"
+        app:srcCompat="@drawable/ic_offline_pin_24dp"
         android:tint="@color/default_icon_color"
         app:layout_column="2"
         app:layout_row="2"

chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java

@@ -103,7 +103,7 @@ public class TabListSceneLayer extends SceneLayer {
 
             int closeButtonColor = useIncognitoColors
                     ? Color.WHITE
-                    : ApiCompatibilityUtils.getColor(res, R.color.light_icon_color);
+                    : ApiCompatibilityUtils.getColor(res, R.color.default_icon_color_secondary);
             float closeButtonSizePx =
                     res.getDimensionPixelSize(R.dimen.tab_switcher_close_button_size);
 

chrome/android/java/src/org/chromium/chrome/browser/omnibox/status/StatusView.java

@@ -14,6 +14,7 @@ import android.support.annotation.DrawableRes;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.support.v4.view.ViewCompat;
+import android.support.v7.content.res.AppCompatResources;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewStub;
@@ -24,7 +25,7 @@ import android.widget.TextView;
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.util.AccessibilityUtil;
-import org.chromium.chrome.browser.widget.TintedDrawable;
+import org.chromium.ui.UiUtils;
 
 /**
  * StatusView is a location bar's view displaying status (icons and/or text).
@@ -71,10 +72,9 @@ public class StatusView extends LinearLayout {
         boolean wantIconHidden = false;
 
         if (mIconRes != 0 && mIconTintRes != 0) {
-            targetIcon =
-                    TintedDrawable.constructTintedDrawable(getContext(), mIconRes, mIconTintRes);
+            targetIcon = UiUtils.getTintedDrawable(getContext(), mIconRes, mIconTintRes);
         } else if (mIconRes != 0) {
-            targetIcon = ApiCompatibilityUtils.getDrawable(getContext().getResources(), mIconRes);
+            targetIcon = AppCompatResources.getDrawable(getContext(), mIconRes);
         } else {
             // Do not specify any icon here and do not replace existing icon, either.
             // TransitionDrawable uses different timing mechanism than Animations, and that may,

chrome/android/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java

@@ -352,7 +352,7 @@ public class LocationBarModel implements ToolbarDataProvider {
         if (isPreview) {
             return R.drawable.preview_pin_round;
         } else if (isOfflinePage) {
-            return R.drawable.offline_pin_round;
+            return R.drawable.ic_offline_pin_24dp;
         }
 
         switch (securityLevel) {

chrome/android/java/src/org/chromium/chrome/browser/widget/accessibility/AccessibilityTabModelListItem.java

@@ -218,7 +218,7 @@ public class AccessibilityTabModelListItem extends FrameLayout implements OnClic
                 context.getResources().getDimensionPixelOffset(R.dimen.accessibility_tab_height);
         mDarkIconColor = ColorUtils.getIconTint(context, false);
         mDefaultCloseIconColor =
-                AppCompatResources.getColorStateList(context, R.color.light_icon_color);
+                AppCompatResources.getColorStateList(context, R.color.default_icon_color_secondary);
         mIncognitoCloseIconColor =
                 AppCompatResources.getColorStateList(context, R.color.white_alpha_70);
         mDefaultLevel = getResources().getInteger(R.integer.list_item_level_default);

chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/TrustedCdnPublisherUrlTest.java

@@ -370,7 +370,7 @@ public class TrustedCdnPublisherUrlTest {
         String testUrl = mWebServer.getResponseUrl("/test.html");
         mCustomTabActivityTestRule.loadUrl(testUrl);
         verifyUrl(UrlFormatter.formatUrlForSecurityDisplayOmitScheme(testUrl));
-        verifySecurityIcon(R.drawable.offline_pin_round);
+        verifySecurityIcon(R.drawable.ic_offline_pin_24dp);
     }
 
     private void runTrustedCdnPublisherUrlTest(@Nullable String publisherUrl, String clientPackage,

chrome/android/junit/src/org/chromium/chrome/browser/toolbar/ToolbarSecurityIconTest.java

@@ -73,11 +73,11 @@ public final class ToolbarSecurityIconTest {
     public void testGetSecurityIconResource() {
         for (int securityLevel : SECURITY_LEVELS) {
             assertEquals("Wrong phone resource for security level " + securityLevel,
-                    R.drawable.offline_pin_round,
+                    R.drawable.ic_offline_pin_24dp,
                     LocationBarModel.getSecurityIconResource(
                             securityLevel, IS_SMALL_DEVICE, IS_OFFLINE_PAGE, !IS_PREVIEW));
             assertEquals("Wrong tablet resource for security level " + securityLevel,
-                    R.drawable.offline_pin_round,
+                    R.drawable.ic_offline_pin_24dp,
                     LocationBarModel.getSecurityIconResource(
                             securityLevel, !IS_SMALL_DEVICE, IS_OFFLINE_PAGE, !IS_PREVIEW));
             assertEquals("Wrong phone resource for security level " + securityLevel,

chrome/test/data/android/render_tests/ArticleSnippetsTest.video_suggestion_with_dark_dominant_color.Nexus_5-19.png.sha1

-8bc7dfdcdbfc619d454dfa1769de42b202e752fd
+ef73f11637ec5cd03f8b6635397c917f0cd78adc
\ No newline at end of file

chrome/test/data/android/render_tests/ArticleSnippetsTest.video_suggestion_with_dark_thumbnail.Nexus_5-19.png.sha1

-6a9031b377dc7e0007ba3455304405a7996cd398
+4d62c938b7ecd9250f30a2ee1854812d9dff9c4e
\ No newline at end of file

chrome/test/data/android/render_tests/ArticleSnippetsTest.video_suggestion_with_light_dominant_color.Nexus_5-19.png.sha1

-64244997cb1a91db14bee9021bc9deae3233dc16
+d199e4f28aa526a334400e3326f09464f5e92bd3
\ No newline at end of file

chrome/test/data/android/render_tests/ArticleSnippetsTest.video_suggestion_with_light_thumbnail.Nexus_5-19.png.sha1

-d66e153937d0f4a4399c1b26837ac1942a7fe5a6
+24cdf45e4687fc2d8a642f512dfde554661b7899
\ No newline at end of file

ui/android/java/res/color/default_icon_color_secondary_list.xml

@@ -6,6 +6,6 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources">
     <item android:alpha="@dimen/default_disabled_alpha"
-        android:color="@color/light_icon_color" android:state_enabled="false"/>
-    <item android:color="@color/light_icon_color" />
+        android:color="@color/default_icon_color_secondary" android:state_enabled="false"/>
+    <item android:color="@color/default_icon_color_secondary" />
 </selector>
\ No newline at end of file

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

@@ -54,6 +54,9 @@
         @color/white_alpha_50
     </color>
 
+    <color name="default_icon_color_secondary_dark">@color/modern_grey_600</color>
+    <color name="default_icon_color_secondary_light">@color/modern_grey_500</color>
+
     <!-- Common text colors -->
     <color name="default_text_color_dark">@color/modern_grey_900</color>
     <color name="default_text_color_light">@android:color/white</color>

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

@@ -34,7 +34,7 @@
     <color name="default_icon_color_blue" tools:ignore="UnusedResources">
         @color/modern_blue_600
     </color>
-    <color name="light_icon_color" tools:ignore="UnusedResources">@color/modern_grey_500</color>
+    <color name="default_icon_color_secondary" tools:ignore="UnusedResources">@color/default_icon_color_secondary_dark</color>
     <color name="hairline_stroke_color">@color/modern_grey_300</color>
 
     <!-- Common background and branding color. -->

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

@@ -19,6 +19,7 @@
     <color name="default_icon_color_inverse">@color/default_icon_color_dark</color>
     <color name="default_icon_color_inverse_disabled">@color/default_icon_color_dark_disabled</color>
     <color name="default_icon_color_blue">@color/modern_blue_300</color>
+    <color name="default_icon_color_secondary">@color/default_icon_color_secondary_light</color>
     <color name="hairline_stroke_color">@color/white_alpha_10</color>
 
     <!-- Common background and branding color. -->