Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Unified Diff: ui/views/animation/ink_drop_animation_controller_impl.cc

Issue 1832963002: MD - add ripples to DL shelf items (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updates after bruthig chat Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/animation/ink_drop_animation_controller_impl.cc
diff --git a/ui/views/animation/ink_drop_animation_controller_impl.cc b/ui/views/animation/ink_drop_animation_controller_impl.cc
index def6df3bb6f0b75a9938766ca38dabad570b65b3..4ebcae84fb6176913494e4c42cd70459a1984df9 100644
--- a/ui/views/animation/ink_drop_animation_controller_impl.cc
+++ b/ui/views/animation/ink_drop_animation_controller_impl.cc
@@ -39,8 +39,8 @@ const int kHoverFadeInAfterAnimationDelayInMs = 1000;
// automatically transition to the InkDropState::HIDDEN state.
bool ShouldAnimateToHidden(InkDropState ink_drop_state) {
switch (ink_drop_state) {
- case views::InkDropState::QUICK_ACTION:
- case views::InkDropState::SLOW_ACTION:
+ case views::InkDropState::ACTION_TRIGGERED:
+ case views::InkDropState::ALTERNATE_ACTION_TRIGGERED:
case views::InkDropState::DEACTIVATED:
return true;
default:
@@ -113,7 +113,7 @@ void InkDropAnimationControllerImpl::SetHovered(bool is_hovered) {
void InkDropAnimationControllerImpl::CompleteHiddenTargetedAnimations() {
if (ink_drop_animation_->target_ink_drop_state() == InkDropState::HIDDEN ||
ShouldAnimateToHidden(ink_drop_animation_->target_ink_drop_state())) {
- ink_drop_animation_->HideImmediately();
+ CreateInkDropAnimation();
}
}

Powered by Google App Engine
This is Rietveld 408576698