Commit 883badea authored by Ahmed Mehfooz's avatar Ahmed Mehfooz Committed by Chromium LUCI CQ

Do not create opaque background for tray buttons during bounce animation

Bug: 1160929
Change-Id: I1dbcf67108e7e07c2a746610b237870db1b1c386
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2633724Reviewed-by: default avatarDavid Black <dmblack@google.com>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Ahmed Mehfooz <amehfooz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#844864}
parent 61acc080
...@@ -372,8 +372,6 @@ void TrayBackgroundView::OnLayerAnimationEnded( ...@@ -372,8 +372,6 @@ void TrayBackgroundView::OnLayerAnimationEnded(
ui::LayerAnimationSequence* sequence) { ui::LayerAnimationSequence* sequence) {
if (!visible_preferred_) if (!visible_preferred_)
views::View::SetVisible(false); views::View::SetVisible(false);
else
UpdateBackground();
} }
void TrayBackgroundView::FadeInAnimation() { void TrayBackgroundView::FadeInAnimation() {
...@@ -409,10 +407,6 @@ void TrayBackgroundView::FadeInAnimation() { ...@@ -409,10 +407,6 @@ void TrayBackgroundView::FadeInAnimation() {
} }
void TrayBackgroundView::BounceInAnimation() { void TrayBackgroundView::BounceInAnimation() {
layer()->SetColor(color_utils::GetResultingPaintColor(
ShelfConfig::Get()->GetShelfControlButtonColor(),
AshColorProvider::Get()->GetBackgroundColor()));
std::unique_ptr<ui::InterpolatedTransform> scale = std::unique_ptr<ui::InterpolatedTransform> scale =
std::make_unique<ui::InterpolatedScale>( std::make_unique<ui::InterpolatedScale>(
gfx::Point3F(kAnimationBounceScaleFactor, kAnimationBounceScaleFactor, gfx::Point3F(kAnimationBounceScaleFactor, kAnimationBounceScaleFactor,
......
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