| commit | b67c410c5c0f1fc0d5ae8940ef0e3566e02afac6 | [log] [tgz] |
|---|---|---|
| author | Yulun Wu <[email protected]> | Wed Oct 14 19:41:12 2020 |
| committer | Commit Bot <[email protected]> | Wed Oct 14 19:41:12 2020 |
| tree | 4cd7900327c55be1d7413e391aef5e96429187be | |
| parent | d3061e6f16c018bcbe46924d4db8ac802c0bebf8 [diff] |
Restore classic ink drop highlights. This addresses changes in: https://chromium-review.googlesource.com/c/chromium/src/+/2442354 Note that the restoration is not exact as we are maintaining a fix to unify launcher inkdrop highlights due to this related bug: https://bugs.chromium.org/p/chromium/issues/detail?id=1051167 (cherry picked from commit f79c2974247a1337c11c44c4f4cc8f37a742cabb) Bug: 1134800 Change-Id: Ie7f70b30bf4ec5fc646cb77e8b18578b96392024 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2464364 Reviewed-by: Yulun Wu <[email protected]> Reviewed-by: Alex Newcomer <[email protected]> Commit-Queue: Yulun Wu <[email protected]> Cr-Original-Commit-Position: refs/heads/master@{#816346} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2472421 Cr-Commit-Position: refs/branch-heads/4280@{#381} Cr-Branched-From: ea420fb963f9658c9969b6513c56b8f47efa1a2a-refs/heads/master@{#812852}
diff --git a/ash/app_list/app_list_color_provider_impl.cc b/ash/app_list/app_list_color_provider_impl.cc index 3aa11b70..260936b 100644 --- a/ash/app_list/app_list_color_provider_impl.cc +++ b/ash/app_list/app_list_color_provider_impl.cc
@@ -167,19 +167,13 @@ } SkColor AppListColorProviderImpl::GetSearchResultViewInkDropColor() const { - AshColorProvider::RippleAttributes ripple_attributes = - ash_color_provider_->GetRippleAttributes( - GetSearchBoxCardBackgroundColor()); - return SkColorSetA(ripple_attributes.base_color, - ripple_attributes.inkdrop_opacity * 255); + return DeprecatedGetInkDropRippleColor( + SkColorSetA(gfx::kGoogleGrey900, 0x14)); } SkColor AppListColorProviderImpl::GetSearchResultViewHighlightColor() const { - AshColorProvider::RippleAttributes ripple_attributes = - ash_color_provider_->GetRippleAttributes( - GetSearchBoxCardBackgroundColor()); - return SkColorSetA(ripple_attributes.base_color, - ripple_attributes.highlight_opacity * 255); + return DeprecatedGetInkDropHighlightColor( + SkColorSetA(gfx::kGoogleGrey900, 0x12)); } float AppListColorProviderImpl::GetFolderBackgrounBlurSigma() const {