Fix incorrect default coloring.

Bug: 1137355
Change-Id: Iab0b1a6b8991c9a39da0dbb2d06b227c242a5c62
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2473137Reviewed-by: Toni Baržić <tbarzic@chromium.org>
Reviewed-by: Yulun Wu <yulunwu@chromium.org>
Commit-Queue: Yulun Wu <yulunwu@chromium.org>
Auto-Submit: Yulun Wu <yulunwu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#817342}

ash/app_list/app_list_color_provider_impl.cc

@@ -82,7 +82,7 @@ SkColor AppListColorProviderImpl::GetSuggestionChipTextColor() const {
 SkColor AppListColorProviderImpl::GetAppListItemTextColor() const {
   return DeprecatedGetContentLayerColor(
       AshColorProvider::ContentLayerType::kTextColorPrimary,
-      /*default_color*/ SK_ColorBLACK);
+      /*default_color*/ SK_ColorWHITE);
 }
 
 SkColor AppListColorProviderImpl::GetPageSwitcherButtonColor(

ash/app_list/views/app_list_item_view.cc

@@ -334,7 +334,9 @@ AppListItemView::AppListItemView(AppsGridView* apps_grid_view,
   title->SetFontList(GetAppListConfig().app_title_font());
   title->SetHorizontalAlignment(gfx::ALIGN_CENTER);
   title->SetEnabledColor(
-      AppListColorProvider::Get()->GetAppListItemTextColor());
+      apps_grid_view_->is_in_folder()
+          ? SK_ColorBLACK
+          : AppListColorProvider::Get()->GetAppListItemTextColor());
 
   if (!is_in_folder) {
     gfx::ShadowValues title_shadow = gfx::ShadowValues(

ash/app_list/views/folder_header_view.cc

@@ -42,6 +42,8 @@ class FolderHeaderView::FolderNameView : public views::Textfield,
         ui::ResourceBundle::GetSharedInstance().GetFontListWithDelta(2));
     set_placeholder_text_color(
         AppListColorProvider::Get()->GetFolderHintTextColor());
+    SetTextColor(AppListColorProvider::Get()->GetFolderTitleTextColor(
+        gfx::kGoogleGrey700));
     SetEventTargeter(std::make_unique<views::ViewTargeter>(this));
   }