Fix bug where app list items were using classic colors in dark mode.

Bug: 1147639
Change-Id: Ib9a7bc5cb7bcbc874704f0889f81989c8901e96e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2530803Reviewed-by: Ahmed Fakhry <afakhry@chromium.org>
Reviewed-by: Yulun Wu <yulunwu@chromium.org>
Reviewed-by: Toni Baržić <tbarzic@chromium.org>
Commit-Queue: Yulun Wu <yulunwu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#829007}

ash/app_list/app_list_color_provider_impl.cc

@@ -4,6 +4,7 @@
 
 #include "ash/app_list/app_list_color_provider_impl.h"
 
+#include "ash/public/cpp/ash_features.h"
 #include "ash/style/ash_color_provider.h"
 #include "ash/style/default_colors.h"
 
@@ -79,7 +80,10 @@ SkColor AppListColorProviderImpl::GetSuggestionChipTextColor() const {
       /*default_color*/ gfx::kGoogleGrey100);
 }
 
-SkColor AppListColorProviderImpl::GetAppListItemTextColor() const {
+SkColor AppListColorProviderImpl::GetAppListItemTextColor(
+    bool is_in_folder) const {
+  if (is_in_folder && !features::IsDarkLightModeEnabled())
+    return SK_ColorBLACK;
   return DeprecatedGetContentLayerColor(
       AshColorProvider::ContentLayerType::kTextColorPrimary,
       /*default_color*/ SK_ColorWHITE);

ash/app_list/app_list_color_provider_impl.h

@@ -26,7 +26,7 @@ class AppListColorProviderImpl : public AppListColorProvider {
   SkColor GetSearchBoxTextColor(SkColor default_color) const override;
   SkColor GetSuggestionChipBackgroundColor() const override;
   SkColor GetSuggestionChipTextColor() const override;
-  SkColor GetAppListItemTextColor() const override;
+  SkColor GetAppListItemTextColor(bool is_in_folder) const override;
   SkColor GetPageSwitcherButtonColor(
       bool is_root_app_grid_page_switcher) const override;
   SkColor GetPageSwitcherInkDropBaseColor(

ash/app_list/test/test_app_list_color_provider.cc

@@ -54,7 +54,8 @@ SkColor TestAppListColorProvider::GetSuggestionChipTextColor() const {
   return gfx::kGoogleGrey200;
 }
 
-SkColor TestAppListColorProvider::GetAppListItemTextColor() const {
+SkColor TestAppListColorProvider::GetAppListItemTextColor(
+    bool is_in_folder) const {
   return gfx::kGoogleGrey200;
 }
 

ash/app_list/test/test_app_list_color_provider.h

@@ -26,7 +26,7 @@ class TestAppListColorProvider : public AppListColorProvider {
   SkColor GetSearchBoxSecondaryTextColor(SkColor default_color) const override;
   SkColor GetSuggestionChipBackgroundColor() const override;
   SkColor GetSuggestionChipTextColor() const override;
-  SkColor GetAppListItemTextColor() const override;
+  SkColor GetAppListItemTextColor(bool is_in_folder) const override;
   SkColor GetPageSwitcherButtonColor(
       bool is_root_app_grid_page_switcher) const override;
   SkColor GetPageSwitcherInkDropBaseColor(

ash/app_list/views/app_list_item_view.cc

@@ -312,10 +312,8 @@ AppListItemView::AppListItemView(AppsGridView* apps_grid_view,
   title->SetHandlesTooltips(false);
   title->SetFontList(GetAppListConfig().app_title_font());
   title->SetHorizontalAlignment(gfx::ALIGN_CENTER);
-  title->SetEnabledColor(
-      apps_grid_view_->is_in_folder()
-          ? SK_ColorBLACK
-          : AppListColorProvider::Get()->GetAppListItemTextColor());
+  title->SetEnabledColor(AppListColorProvider::Get()->GetAppListItemTextColor(
+      apps_grid_view_->is_in_folder()));
 
   icon_ = AddChildView(std::make_unique<IconImageView>());
 

ash/public/cpp/app_list/app_list_color_provider.h

@@ -29,7 +29,7 @@ class ASH_PUBLIC_EXPORT AppListColorProvider {
       SkColor default_color) const = 0;
   virtual SkColor GetSuggestionChipBackgroundColor() const = 0;
   virtual SkColor GetSuggestionChipTextColor() const = 0;
-  virtual SkColor GetAppListItemTextColor() const = 0;
+  virtual SkColor GetAppListItemTextColor(bool is_in_folder) const = 0;
   virtual SkColor GetPageSwitcherButtonColor(
       bool is_root_app_grid_page_switcher) const = 0;
   virtual SkColor GetPageSwitcherInkDropBaseColor(