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

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

Issue 1422593003: Made material design ink drop QUICK_ACTION animation more visible. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added varkha@'s behavioural changes Created 5 years, 1 month 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_factory.cc
diff --git a/ui/views/animation/ink_drop_animation_controller_factory.cc b/ui/views/animation/ink_drop_animation_controller_factory.cc
index 0c22b41718023094d820bb237a4ee2a01e540389..1ff2a76cc098604cf5bc9930c92139fe76adad35 100644
--- a/ui/views/animation/ink_drop_animation_controller_factory.cc
+++ b/ui/views/animation/ink_drop_animation_controller_factory.cc
@@ -26,6 +26,7 @@ class InkDropAnimationControllerStub
// InkDropAnimationController:
InkDropState GetInkDropState() const override;
void AnimateToState(InkDropState state) override;
+ bool WillAutoAnimateToHidden() const override;
void SetHovered(bool is_hovered) override;
bool IsHovered() const override;
gfx::Size GetInkDropLargeSize() const override;
@@ -56,6 +57,10 @@ void InkDropAnimationControllerStub::AnimateToState(InkDropState state) {
SetHovered(false);
}
+bool InkDropAnimationControllerStub::WillAutoAnimateToHidden() const {
+ return false;
+}
+
void InkDropAnimationControllerStub::SetHovered(bool is_hovered) {
is_hovered_ = is_hovered;
}

Powered by Google App Engine
This is Rietveld 408576698