Commit 64f8e172 authored by Sammie Quon's avatar Sammie Quon Committed by Commit Bot

dark mode: Flip base colors for ink drop.

Original thought the dark ripple was for the dark background.

Test: manual
Bug: 1117203
Change-Id: I3221271f8bb1d1d32a8832c75a46c0b8f726426e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2363997Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Sammie Quon <sammiequon@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799392}
parent c3ee7e10
......@@ -179,7 +179,7 @@ SkColor AshColorProvider::GetContentLayerColor(
AshColorProvider::RippleAttributes AshColorProvider::GetRippleAttributes(
SkColor bg_color) const {
const bool is_dark = color_utils::IsDark(bg_color);
const SkColor base_color = is_dark ? SK_ColorBLACK : SK_ColorWHITE;
const SkColor base_color = is_dark ? SK_ColorWHITE : SK_ColorBLACK;
const float opacity =
is_dark ? kLightInkRippleOpacity : kDarkInkRippleOpacity;
return RippleAttributes(base_color, opacity, opacity);
......
......@@ -336,7 +336,7 @@ TrayBackgroundView::CreateInkDropHighlight() const {
ShelfConfig::Get()->GetDefaultShelfColor());
auto highlight = std::make_unique<views::InkDropHighlight>(
gfx::SizeF(bounds.size()), ripple_attributes.base_color);
highlight->set_visible_opacity(ripple_attributes.inkdrop_opacity);
highlight->set_visible_opacity(ripple_attributes.highlight_opacity);
return highlight;
}
......
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