Fix ink drop opacity for expand arrow.

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

ash/app_list/app_list_color_provider_impl.cc

@@ -32,6 +32,10 @@ SkColor AppListColorProviderImpl::GetExpandArrowInkDropBaseColor() const {
       /*default_color*/ SkColorSetARGB(0x14, 0xFF, 0xFF, 0xFF));
 }
 
+float AppListColorProviderImpl::GetExpandArrowInkDropOpacity() const {
+  return DeprecatedGetInkDropOpacity(/*default_opacity*/ 1.0f);
+}
+
 SkColor AppListColorProviderImpl::GetExpandArrowIconBaseColor() const {
   return DeprecatedGetContentLayerColor(
       AshColorProvider::ContentLayerType::kButtonIconColor,

ash/app_list/app_list_color_provider_impl.h

@@ -17,6 +17,7 @@ class AppListColorProviderImpl : public AppListColorProvider {
   ~AppListColorProviderImpl() override;
   // AppListColorProvider:
   SkColor GetExpandArrowInkDropBaseColor() const override;
+  float GetExpandArrowInkDropOpacity() const override;
   SkColor GetExpandArrowIconBaseColor() const override;
   SkColor GetExpandArrowIconBackgroundColor() const override;
   SkColor GetAppListBackgroundColor() const override;

ash/app_list/views/expand_arrow_view.cc

@@ -283,7 +283,8 @@ std::unique_ptr<views::InkDropRipple> ExpandArrowView::CreateInkDropRipple()
   return std::make_unique<views::FloodFillInkDropRipple>(
       size(), GetLocalBounds().InsetsFrom(GetCircleBounds()),
       GetInkDropCenterBasedOnLastEvent(),
-      AppListColorProvider::Get()->GetExpandArrowInkDropBaseColor(), 1.0f);
+      AppListColorProvider::Get()->GetExpandArrowInkDropBaseColor(),
+      AppListColorProvider::Get()->GetExpandArrowInkDropOpacity());
 }
 
 void ExpandArrowView::AnimationProgressed(const gfx::Animation* animation) {

ash/public/cpp/app_list/app_list_color_provider.h

@@ -22,6 +22,7 @@ class ASH_PUBLIC_EXPORT AppListColorProvider {
   static AppListColorProvider* Get();
 
   virtual SkColor GetExpandArrowInkDropBaseColor() const = 0;
+  virtual float GetExpandArrowInkDropOpacity() const = 0;
   virtual SkColor GetExpandArrowIconBaseColor() const = 0;
   virtual SkColor GetExpandArrowIconBackgroundColor() const = 0;
   virtual SkColor GetAppListBackgroundColor() const = 0;

ash/public/cpp/test/test_app_list_color_provider.cc

@@ -12,6 +12,10 @@ SkColor TestAppListColorProvider::GetExpandArrowInkDropBaseColor() const {
   return SK_ColorWHITE;
 }
 
+float TestAppListColorProvider::GetExpandArrowInkDropOpacity() const {
+  return 1.0f;
+}
+
 SkColor TestAppListColorProvider::GetExpandArrowIconBaseColor() const {
   return gfx::kGoogleGrey200;
 }

ash/public/cpp/test/test_app_list_color_provider.h

@@ -17,6 +17,7 @@ class TestAppListColorProvider : public AppListColorProvider {
  public:
   // AppListColorProvider:
   SkColor GetExpandArrowInkDropBaseColor() const override;
+  float GetExpandArrowInkDropOpacity() const override;
   SkColor GetExpandArrowIconBaseColor() const override;
   SkColor GetExpandArrowIconBackgroundColor() const override;
   SkColor GetAppListBackgroundColor() const override;