Update shelf bubble color to use themed colors.

Bug: 1145414
Change-Id: I6f218dd45ed9403326e205cb9f125edd6ff25de9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2545052Reviewed-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@{#831977}

ash/app_list/app_list_color_provider_impl.cc

@@ -125,6 +125,12 @@ SkColor AppListColorProviderImpl::GetFolderBackgroundColor(
       AshColorProvider::BaseLayerType::kTransparent80, default_color);
 }
 
+SkColor AppListColorProviderImpl::GetFolderBubbleColor() const {
+  return DeprecatedGetControlsLayerColor(
+      AshColorProvider::ControlsLayerType::kControlBackgroundColorInactive,
+      SkColorSetA(gfx::kGoogleGrey100, 0x7A));
+}
+
 SkColor AppListColorProviderImpl::GetFolderTitleTextColor(
     SkColor default_color) const {
   return DeprecatedGetContentLayerColor(

ash/app_list/app_list_color_provider_impl.h

@@ -36,6 +36,7 @@ class AppListColorProviderImpl : public AppListColorProvider {
   SkColor GetSearchBoxIconColor(SkColor default_color) const override;
   SkColor GetSearchBoxCardBackgroundColor() const override;
   SkColor GetFolderBackgroundColor(SkColor default_color) const override;
+  SkColor GetFolderBubbleColor() const override;
   SkColor GetFolderTitleTextColor(SkColor default_color) const override;
   SkColor GetFolderHintTextColor() const override;
   SkColor GetFolderNameBackgroundColor(bool active) const override;

ash/app_list/model/folder_image.cc

@@ -9,12 +9,14 @@
 
 #include "ash/app_list/model/app_list_item.h"
 #include "ash/app_list/model/app_list_item_list.h"
+#include "ash/public/cpp/app_list/app_list_color_provider.h"
 #include "ash/public/cpp/app_list/app_list_config.h"
 #include "ash/public/cpp/app_list/app_list_config_provider.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/color_palette.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/geometry/rect.h"
@@ -34,6 +36,9 @@ constexpr int kIconShadowBlur = 5;
 // The shadow color of icon.
 constexpr SkColor kIconShadowColor = SkColorSetA(SK_ColorBLACK, 31);
 
+// The default bubble color.
+constexpr SkColor kDefaultBubbleColor = SkColorSetA(gfx::kGoogleGrey100, 0x7A);
+
 // Generates the folder icon with the top 4 child item icons laid in 2x2 tile.
 class FolderImageSource : public gfx::CanvasImageSource {
  public:
@@ -116,7 +121,9 @@ void FolderImageSource::Draw(gfx::Canvas* canvas) {
   cc::PaintFlags flags;
   flags.setStyle(cc::PaintFlags::kFill_Style);
   flags.setAntiAlias(true);
-  flags.setColor(app_list_config_.folder_bubble_color());
+  flags.setColor(AppListColorProvider::Get()
+                     ? AppListColorProvider::Get()->GetFolderBubbleColor()
+                     : kDefaultBubbleColor);
   canvas->DrawCircle(bubble_center, app_list_config_.folder_bubble_radius(),
                      flags);
 

ash/app_list/test/test_app_list_color_provider.cc

@@ -64,6 +64,10 @@ SkColor TestAppListColorProvider::GetFolderBackgroundColor(
   return gfx::kGoogleGrey900;
 }
 
+SkColor TestAppListColorProvider::GetFolderBubbleColor() const {
+  return SkColorSetA(gfx::kGoogleGrey100, 0x7A);
+}
+
 SkColor TestAppListColorProvider::GetPageSwitcherButtonColor(
     bool is_root_app_grid_page_switcher) const {
   return gfx::kGoogleGrey700;

ash/app_list/test/test_app_list_color_provider.h

@@ -36,6 +36,7 @@ class TestAppListColorProvider : public AppListColorProvider {
   SkColor GetSearchBoxIconColor(SkColor default_color) const override;
   SkColor GetSearchBoxCardBackgroundColor() const override;
   SkColor GetFolderBackgroundColor(SkColor default_color) const override;
+  SkColor GetFolderBubbleColor() const override;
   SkColor GetFolderTitleTextColor(SkColor default_color) const override;
   SkColor GetFolderHintTextColor() const override;
   SkColor GetFolderNameBackgroundColor(bool active) const override;

ash/app_list/views/app_list_folder_view.cc

@@ -95,11 +95,11 @@ class BackgroundAnimation : public AppListFolderView::Animation,
         AppListColorProvider::Get()->GetFolderBackgroundColor(
             folder_view_->GetAppListConfig().folder_background_color());
     const SkColor from_color =
-        show_ ? folder_view_->GetAppListConfig().folder_bubble_color()
+        show_ ? AppListColorProvider::Get()->GetFolderBubbleColor()
               : background_color;
     const SkColor to_color =
         show_ ? background_color
-              : folder_view_->GetAppListConfig().folder_bubble_color();
+              : AppListColorProvider::Get()->GetFolderBubbleColor();
 
     background_view_->layer()->SetColor(from_color);
     background_view_->layer()->SetBackgroundBlur(

ash/app_list/views/app_list_item_view.cc

@@ -718,7 +718,7 @@ void AppListItemView::PaintButtonContents(gfx::Canvas* canvas) {
   cc::PaintFlags flags;
   flags.setStyle(cc::PaintFlags::kFill_Style);
   flags.setAntiAlias(true);
-  flags.setColor(GetAppListConfig().folder_bubble_color());
+  flags.setColor(AppListColorProvider::Get()->GetFolderBubbleColor());
   canvas->DrawCircle(center, preview_circle_radius, flags);
 }
 

ash/public/cpp/app_list/app_list_color_provider.h

@@ -39,6 +39,7 @@ class ASH_PUBLIC_EXPORT AppListColorProvider {
   virtual SkColor GetSearchBoxIconColor(SkColor default_color) const = 0;
   virtual SkColor GetSearchBoxCardBackgroundColor() const = 0;
   virtual SkColor GetFolderBackgroundColor(SkColor default_color) const = 0;
+  virtual SkColor GetFolderBubbleColor() const = 0;
   virtual SkColor GetFolderTitleTextColor(SkColor default_color) const = 0;
   virtual SkColor GetFolderHintTextColor() const = 0;
   virtual SkColor GetFolderNameBackgroundColor(bool active) const = 0;

ash/public/cpp/app_list/app_list_config.cc

@@ -305,7 +305,6 @@ AppListConfig::AppListConfig(AppListConfigType type)
           FolderUnclippedIconDimensionForType(type)),
       folder_icon_radius_(FolderClippedIconDimensionForType(type) / 2),
       folder_background_radius_(12),
-      folder_bubble_color_(SkColorSetA(gfx::kGoogleGrey100, 0x7A)),
       item_icon_in_folder_icon_dimension_(
           ItemIconInFolderIconDimensionForType(type)),
       item_icon_in_folder_icon_margin_(ItemIconInFolderIconMarginForType(type)),
@@ -442,7 +441,6 @@ AppListConfig::AppListConfig(const AppListConfig& base_config,
                                    inner_tile_scale_y)),
       folder_background_radius_(
           MinScale(base_config.folder_background_radius_, scale_x, scale_y)),
-      folder_bubble_color_(base_config.folder_bubble_color_),
       item_icon_in_folder_icon_dimension_(
           MinScale(base_config.item_icon_in_folder_icon_dimension_,
                    scale_x,

ash/public/cpp/app_list/app_list_config.h

@@ -132,7 +132,6 @@ class ASH_PUBLIC_EXPORT AppListConfig {
   }
   int folder_icon_radius() const { return folder_icon_radius_; }
   int folder_background_radius() const { return folder_background_radius_; }
-  int folder_bubble_color() const { return folder_bubble_color_; }
   int item_icon_in_folder_icon_dimension() const {
     return item_icon_in_folder_icon_dimension_;
   }
@@ -409,9 +408,6 @@ class ASH_PUBLIC_EXPORT AppListConfig {
   // The corner radius of folder background.
   const int folder_background_radius_;
 
-  // The color of folder bubble.
-  const int folder_bubble_color_;
-
   // The dimension of the item icon in folder icon.
   const int item_icon_in_folder_icon_dimension_;