Commit f79c2974 authored by Yulun Wu's avatar Yulun Wu Committed by Commit Bot

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

Bug: 1134800
Change-Id: Ie7f70b30bf4ec5fc646cb77e8b18578b96392024
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2464364Reviewed-by: default avatarYulun Wu <yulunwu@chromium.org>
Reviewed-by: default avatarAlex Newcomer <newcomer@chromium.org>
Commit-Queue: Yulun Wu <yulunwu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#816346}
parent 3baee52f
...@@ -158,24 +158,19 @@ SkColor AppListColorProviderImpl::GetContentsBackgroundColor() const { ...@@ -158,24 +158,19 @@ SkColor AppListColorProviderImpl::GetContentsBackgroundColor() const {
} }
SkColor AppListColorProviderImpl::GetSeparatorColor() const { SkColor AppListColorProviderImpl::GetSeparatorColor() const {
return ash_color_provider_->GetContentLayerColor( return DeprecatedGetContentLayerColor(
AshColorProvider::ContentLayerType::kSeparatorColor); AshColorProvider::ContentLayerType::kSeparatorColor,
SkColorSetA(gfx::kGoogleGrey900, 0x24));
} }
SkColor AppListColorProviderImpl::GetSearchResultViewInkDropColor() const { SkColor AppListColorProviderImpl::GetSearchResultViewInkDropColor() const {
AshColorProvider::RippleAttributes ripple_attributes = return DeprecatedGetInkDropRippleColor(
ash_color_provider_->GetRippleAttributes( SkColorSetA(gfx::kGoogleGrey900, 0x14));
GetSearchBoxCardBackgroundColor());
return SkColorSetA(ripple_attributes.base_color,
ripple_attributes.inkdrop_opacity * 255);
} }
SkColor AppListColorProviderImpl::GetSearchResultViewHighlightColor() const { SkColor AppListColorProviderImpl::GetSearchResultViewHighlightColor() const {
AshColorProvider::RippleAttributes ripple_attributes = return DeprecatedGetInkDropHighlightColor(
ash_color_provider_->GetRippleAttributes( SkColorSetA(gfx::kGoogleGrey900, 0x12));
GetSearchBoxCardBackgroundColor());
return SkColorSetA(ripple_attributes.base_color,
ripple_attributes.highlight_opacity * 255);
} }
float AppListColorProviderImpl::GetFolderBackgrounBlurSigma() const { float AppListColorProviderImpl::GetFolderBackgrounBlurSigma() const {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment