Restore classic app list folder view colors.

This CL addresses changes in:

https://chromium-review.googlesource.com/c/chromium/src/+/2417241

Bug: 1134800
Change-Id: I9ce7301dcdfe9940a10f3920e2901a051ff0f0e0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2462556Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Yulun Wu <yulunwu@chromium.org>
Commit-Queue: Yulun Wu <yulunwu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#815686}

ash/app_list/app_list_color_provider_impl.cc

@@ -105,19 +105,22 @@ SkColor AppListColorProviderImpl::GetSearchBoxIconColor() const {
       AshColorProvider::ContentLayerType::kButtonIconColor);
 }
 
-SkColor AppListColorProviderImpl::GetFolderBackgroundColor() const {
-  return ash_color_provider_->GetBaseLayerColor(
-      AshColorProvider::BaseLayerType::kTransparent80);
+SkColor AppListColorProviderImpl::GetFolderBackgroundColor(
+    SkColor default_color) const {
+  return DeprecatedGetBaseLayerColor(
+      AshColorProvider::BaseLayerType::kTransparent80, default_color);
 }
 
-SkColor AppListColorProviderImpl::GetFolderTitleTextColor() const {
-  return ash_color_provider_->GetContentLayerColor(
-      AshColorProvider::ContentLayerType::kTextColorPrimary);
+SkColor AppListColorProviderImpl::GetFolderTitleTextColor(
+    SkColor default_color) const {
+  return DeprecatedGetContentLayerColor(
+      AshColorProvider::ContentLayerType::kTextColorPrimary, default_color);
 }
 
 SkColor AppListColorProviderImpl::GetFolderHintTextColor() const {
-  return ash_color_provider_->GetContentLayerColor(
-      AshColorProvider::ContentLayerType::kTextColorSecondary);
+  return DeprecatedGetContentLayerColor(
+      AshColorProvider::ContentLayerType::kTextColorSecondary,
+      gfx::kGoogleGrey600);
 }
 
 SkColor AppListColorProviderImpl::GetFolderNameBackgroundColor(

ash/app_list/app_list_color_provider_impl.h

@@ -32,8 +32,8 @@ class AppListColorProviderImpl : public AppListColorProvider {
   SkColor GetPageSwitcherInkDropHighlightColor() const override;
   SkColor GetSearchBoxIconColor() const override;
   SkColor GetSearchBoxCardBackgroundColor() const override;
-  SkColor GetFolderBackgroundColor() const override;
-  SkColor GetFolderTitleTextColor() const override;
+  SkColor GetFolderBackgroundColor(SkColor default_color) const override;
+  SkColor GetFolderTitleTextColor(SkColor default_color) const override;
   SkColor GetFolderHintTextColor() const override;
   SkColor GetFolderNameBackgroundColor(bool active) const override;
   SkColor GetFolderNameBorderColor(bool active) const override;

ash/app_list/test/test_app_list_color_provider.cc

@@ -56,7 +56,8 @@ SkColor TestAppListColorProvider::GetAppListItemTextColor() const {
   return gfx::kGoogleGrey200;
 }
 
-SkColor TestAppListColorProvider::GetFolderBackgroundColor() const {
+SkColor TestAppListColorProvider::GetFolderBackgroundColor(
+    SkColor default_color) const {
   return gfx::kGoogleGrey900;
 }
 
@@ -76,7 +77,8 @@ SkColor TestAppListColorProvider::GetSearchBoxIconColor() const {
   return gfx::kGoogleGrey200;
 }
 
-SkColor TestAppListColorProvider::GetFolderTitleTextColor() const {
+SkColor TestAppListColorProvider::GetFolderTitleTextColor(
+    SkColor default_color) const {
   return gfx::kGoogleGrey200;
 }
 

ash/app_list/test/test_app_list_color_provider.h

@@ -32,8 +32,8 @@ class TestAppListColorProvider : public AppListColorProvider {
   SkColor GetPageSwitcherInkDropHighlightColor() const override;
   SkColor GetSearchBoxIconColor() const override;
   SkColor GetSearchBoxCardBackgroundColor() const override;
-  SkColor GetFolderBackgroundColor() const override;
-  SkColor GetFolderTitleTextColor() const override;
+  SkColor GetFolderBackgroundColor(SkColor default_color) const override;
+  SkColor GetFolderTitleTextColor(SkColor default_color) const override;
   SkColor GetFolderHintTextColor() const override;
   SkColor GetFolderNameBackgroundColor(bool active) const override;
   SkColor GetFolderNameBorderColor(bool active) const override;

ash/app_list/views/app_list_folder_view.cc

@@ -92,7 +92,8 @@ class BackgroundAnimation : public AppListFolderView::Animation,
                               : folder_view_->folder_item_icon_bounds();
     to_rect -= background_view_->bounds().OffsetFromOrigin();
     const SkColor background_color =
-        AppListColorProvider::Get()->GetFolderBackgroundColor();
+        AppListColorProvider::Get()->GetFolderBackgroundColor(
+            folder_view_->GetAppListConfig().folder_background_color());
     const SkColor from_color =
         show_ ? folder_view_->GetAppListConfig().folder_bubble_color()
               : background_color;
@@ -150,10 +151,14 @@ class FolderItemTitleAnimation : public AppListFolderView::Animation,
         animation_(this),
         folder_view_(folder_view) {
     // Calculate the source and target states.
-    from_color_ = show_ ? AppListColorProvider::Get()->GetFolderTitleTextColor()
+    from_color_ = show_
+                      ? AppListColorProvider::Get()->GetFolderTitleTextColor(
+                            folder_view_->GetAppListConfig().grid_title_color())
                       : SK_ColorTRANSPARENT;
-    to_color_ = show_ ? SK_ColorTRANSPARENT
-                      : AppListColorProvider::Get()->GetFolderTitleTextColor();
+    to_color_ = show_
+                    ? SK_ColorTRANSPARENT
+                    : AppListColorProvider::Get()->GetFolderTitleTextColor(
+                          folder_view_->GetAppListConfig().grid_title_color());
 
     animation_.SetTweenType(gfx::Tween::FAST_OUT_SLOW_IN);
     animation_.SetSlideDuration(
@@ -827,7 +832,8 @@ void AppListFolderView::HideViewImmediately() {
   if (activated_folder_item_view) {
     activated_folder_item_view->SetIconVisible(true);
     activated_folder_item_view->title()->SetEnabledColor(
-        AppListColorProvider::Get()->GetFolderTitleTextColor());
+        AppListColorProvider::Get()->GetFolderTitleTextColor(
+            GetAppListConfig().grid_title_color()));
     activated_folder_item_view->title()->SetVisible(true);
   }
 }

ash/app_list/views/folder_header_view.cc

@@ -61,7 +61,8 @@ class FolderHeaderView::FolderNameView : public views::Textfield,
         color_provider->GetFolderNameBackgroundColor(is_active),
         AppListConfig::instance().folder_name_border_radius()));
 
-    const SkColor text_color = color_provider->GetFolderTitleTextColor();
+    const SkColor text_color =
+        color_provider->GetFolderTitleTextColor(gfx::kGoogleGrey700);
     SetTextColor(text_color);
     SetSelectionTextColor(text_color);
     SetSelectionBackgroundColor(color_provider->GetFolderNameSelectionColor());

ash/public/cpp/app_list/app_list_color_provider.h

@@ -31,8 +31,8 @@ class ASH_PUBLIC_EXPORT AppListColorProvider {
   virtual SkColor GetPageSwitcherInkDropHighlightColor() const = 0;
   virtual SkColor GetSearchBoxIconColor() const = 0;
   virtual SkColor GetSearchBoxCardBackgroundColor() const = 0;
-  virtual SkColor GetFolderBackgroundColor() const = 0;
-  virtual SkColor GetFolderTitleTextColor() const = 0;
+  virtual SkColor GetFolderBackgroundColor(SkColor default_color) const = 0;
+  virtual SkColor GetFolderTitleTextColor(SkColor default_color) const = 0;
   virtual SkColor GetFolderHintTextColor() const = 0;
   virtual SkColor GetFolderNameBackgroundColor(bool active) const = 0;
   virtual SkColor GetFolderNameBorderColor(bool active) const = 0;