Made material design ink drop QUICK_ACTION animation more visible.

ui/views/animation/ink_drop_animation_controller_impl.cc

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 74d681d8d637422bd900240fac416aa68d3a33d2..7d6f05d5289677eb93abd9dff82d84e40a9587ef 100644
--- a/ui/views/animation/ink_drop_animation_controller_impl.cc
+++ b/ui/views/animation/ink_drop_animation_controller_impl.cc
@@ -4,19 +4,57 @@
 
 #include "ui/views/animation/ink_drop_animation_controller_impl.h"
 
+#include "base/auto_reset.h"
+#include "base/timer/timer.h"
+#include "ui/compositor/layer.h"
 #include "ui/views/animation/ink_drop_animation.h"
+#include "ui/views/animation/ink_drop_consumer.h"
 #include "ui/views/animation/ink_drop_host.h"
+#include "ui/views/animation/ink_drop_hover.h"
 
 namespace views {
 
+namespace {
+
+// The duration, in milliseconds, of the hover state fade in animation when it
+// is triggered by user input.
+const int kHoverFadeInFromUserInputDurationInMs = 250;
+
+// The duration, in milliseconds, of the hover state fade out animation when it
+// is triggered by user input.
+const int kHoverFadeOutFromUserInputDurationInMs = 250;
+
+// The duration, in milliseconds, of the hover state fade in animation when it
+// is triggered by an ink drop ripple animation ending.
+const int kHoverFadeInAfterAnimationDurationInMs = 250;
+
+// The duration, in milliseconds, of the hover state fade out animation when it
+// is triggered by an ink drop ripple animation starting.
+const int kHoverFadeOutBeforeAnimationDurationInMs = 0;
+
+// The amount of time in milliseconds that |hover_| should delay after a ripple
+// animation before fading in.
+const int kHoverFadeInAfterAnimationDelayInMs = 1000;
+
+}  // namespace
+
 InkDropAnimationControllerImpl::InkDropAnimationControllerImpl(
-    InkDropHost* ink_drop_host)
-    : ink_drop_host_(ink_drop_host) {}
+    InkDropHost* ink_drop_host,
+    InkDropConsumer* ink_drop_consumer)
+    : ink_drop_host_(ink_drop_host),
+      ink_drop_consumer_(ink_drop_consumer),
+      ink_drop_large_corner_radius_(0),
+      ink_drop_small_corner_radius_(0),
+      root_layer_(new ui::Layer(ui::LAYER_NOT_DRAWN)),
+      can_destroy_after_hidden_animation_(true) {
+  ink_drop_host_->AddInkDropLayer(root_layer_.get());
+}
 
 InkDropAnimationControllerImpl::~InkDropAnimationControllerImpl() {
   // Explicitly destroy the InkDropAnimation so that this still exists if
   // views::InkDropAnimationObserver methods are called on this.
   DestroyInkDropAnimation();
+  ink_drop_host_->RemoveInkDropLayer(root_layer_.get());
 }
 
 InkDropState InkDropAnimationControllerImpl::GetInkDropState() const {
@@ -29,9 +67,46 @@ void InkDropAnimationControllerImpl::AnimateToState(
     InkDropState ink_drop_state) {
   if (!ink_drop_animation_)
     CreateInkDropAnimation();
+
+  // The InkDropAnimationObserver::InkDropAnimationEnded() callback needs to
+  // know if it is safe to destroy the |ink_drop_animation_| and it is not safe
+  // when the notification is raised within a call to
+  // InkDropAnimation::AnimateToState().
+  base::AutoReset<bool> auto_reset_can_destroy_after_hidden_animation(
+      &can_destroy_after_hidden_animation_, false);
+
+  // Make sure the ink drop completes its full state transitions if it was going
+  // to auto transition to the HIDDEN state.
+  if (WillAutoAnimateToHidden())
+    ink_drop_animation_->AnimateToState(views::InkDropState::HIDDEN);
   ink_drop_animation_->AnimateToState(ink_drop_state);
 }
 
+bool InkDropAnimationControllerImpl::WillAutoAnimateToHidden() const {
+  if (!ink_drop_animation_)
+    return false;
+  switch (ink_drop_animation_->ink_drop_state()) {
+    case views::InkDropState::QUICK_ACTION:
+    case views::InkDropState::SLOW_ACTION:
+    case views::InkDropState::DEACTIVATED:
+      return true;
+    default:
+      return false;
+  }
+}
+
+void InkDropAnimationControllerImpl::SetHovered(bool is_hovered) {
+  SetHoveredInternal(is_hovered,
+                     is_hovered ? base::TimeDelta::FromMilliseconds(
+                                      kHoverFadeInFromUserInputDurationInMs)
+                                : base::TimeDelta::FromMilliseconds(
+                                      kHoverFadeOutFromUserInputDurationInMs));
+}
+
+bool InkDropAnimationControllerImpl::IsHovered() const {
+  return hover_ && hover_->IsVisible();
+}
+
 gfx::Size InkDropAnimationControllerImpl::GetInkDropLargeSize() const {
   return ink_drop_large_size_;
 }
@@ -49,7 +124,9 @@ void InkDropAnimationControllerImpl::SetInkDropSize(const gfx::Size& large_size,
   ink_drop_large_corner_radius_ = large_corner_radius;
   ink_drop_small_size_ = small_size;
   ink_drop_small_corner_radius_ = small_corner_radius;
-  ink_drop_animation_.reset();
+
+  DestroyInkDropAnimation();
+  DestroyInkDropHover();
 }
 
 void InkDropAnimationControllerImpl::SetInkDropCenter(
@@ -57,6 +134,8 @@ void InkDropAnimationControllerImpl::SetInkDropCenter(
   ink_drop_center_ = center_point;
   if (ink_drop_animation_)
     ink_drop_animation_->SetCenterPoint(ink_drop_center_);
+  if (hover_)
+    hover_->SetCenterPoint(ink_drop_center_);
 }
 
 void InkDropAnimationControllerImpl::CreateInkDropAnimation() {
@@ -68,40 +147,97 @@ void InkDropAnimationControllerImpl::CreateInkDropAnimation() {
 
   ink_drop_animation_->AddObserver(this);
   ink_drop_animation_->SetCenterPoint(ink_drop_center_);
-  ink_drop_host_->AddInkDropLayer(ink_drop_animation_->root_layer());
+  root_layer_->Add(ink_drop_animation_->root_layer());
 }
 
 void InkDropAnimationControllerImpl::DestroyInkDropAnimation() {
   if (!ink_drop_animation_)
     return;
-  ink_drop_host_->RemoveInkDropLayer(ink_drop_animation_->root_layer());
+  root_layer_->Remove(ink_drop_animation_->root_layer());
   ink_drop_animation_->RemoveObserver(this);
   ink_drop_animation_.reset();
 }
 
+void InkDropAnimationControllerImpl::CreateInkDropHover() {
+  DestroyInkDropHover();
+
+  hover_.reset(
+      new InkDropHover(ink_drop_small_size_, ink_drop_small_corner_radius_));
+  hover_->SetCenterPoint(ink_drop_center_);
+  root_layer_->Add(hover_->layer());
+}
+
+void InkDropAnimationControllerImpl::DestroyInkDropHover() {
+  if (!hover_)
+    return;
+  root_layer_->Remove(hover_->layer());
+  hover_.reset();
+}
+
 void InkDropAnimationControllerImpl::InkDropAnimationStarted(
-    InkDropState ink_drop_state) {}
+    InkDropState ink_drop_state) {
+  if (ink_drop_state != views::InkDropState::HIDDEN) {
+    SetHoveredInternal(false, base::TimeDelta::FromMilliseconds(
+                                  kHoverFadeOutBeforeAnimationDurationInMs));
+  }
+}
 
 void InkDropAnimationControllerImpl::InkDropAnimationEnded(
     InkDropState ink_drop_state,
     InkDropAnimationEndedReason reason) {
   if (reason != SUCCESS)
     return;
-  switch (ink_drop_state) {
-    case views::InkDropState::QUICK_ACTION:
-    case views::InkDropState::SLOW_ACTION:
-    case views::InkDropState::DEACTIVATED:
-      ink_drop_animation_->AnimateToState(views::InkDropState::HIDDEN);
-      break;
-    case views::InkDropState::HIDDEN:
+  if (WillAutoAnimateToHidden())
+    ink_drop_animation_->AnimateToState(views::InkDropState::HIDDEN);
+  else if (ink_drop_state == views::InkDropState::HIDDEN) {
+    StartHoverAfterAnimationTimer();
+    if (can_destroy_after_hidden_animation_) {
       // TODO(bruthig): Investigate whether creating and destroying
       // InkDropAnimations is expensive and consider creating an
       // InkDropAnimationPool. See www.crbug.com/522175.
       DestroyInkDropAnimation();
-      break;
-    default:
-      break;
+    }
   }
 }
 
+void InkDropAnimationControllerImpl::SetHoveredInternal(
+    bool is_hovered,
+    base::TimeDelta animation_duration) {
+  StopHoverAfterAnimationTimer();
+
+  if (IsHovered() == is_hovered)
+    return;
+
+  if (is_hovered) {
+    if (!hover_)
+      CreateInkDropHover();
+    if (GetInkDropState() == views::InkDropState::HIDDEN) {
+      hover_->FadeIn(animation_duration);
+    }
+  } else {
+    hover_->FadeOut(animation_duration);
+  }
+}
+
+void InkDropAnimationControllerImpl::StartHoverAfterAnimationTimer() {
+  StopHoverAfterAnimationTimer();
+
+  hover_after_animation_timer_.reset(new base::OneShotTimer());
+  hover_after_animation_timer_->Start(
+      FROM_HERE,
+      base::TimeDelta::FromMilliseconds(kHoverFadeInAfterAnimationDelayInMs),
+      this, &InkDropAnimationControllerImpl::HoverAfterAnimationTimerFired);
+}
+
+void InkDropAnimationControllerImpl::StopHoverAfterAnimationTimer() {
+  hover_after_animation_timer_.reset();
+}
+
+void InkDropAnimationControllerImpl::HoverAfterAnimationTimerFired() {
+  hover_after_animation_timer_.reset();
+  SetHoveredInternal(ink_drop_consumer_->ShouldShowInkDropHover(),
+                     base::TimeDelta::FromMilliseconds(
+                         kHoverFadeInAfterAnimationDurationInMs));
+}
+
 }  // namespace views