Add MD Ink Drop Layers to InkDropHost only when a ripple/hover is active.

ui/views/animation/ink_drop_animation_controller_impl_unittest.cc

Index: ui/views/animation/ink_drop_animation_controller_impl_unittest.cc
diff --git a/ui/views/animation/ink_drop_animation_controller_impl_unittest.cc b/ui/views/animation/ink_drop_animation_controller_impl_unittest.cc
index 8ceab475be11f702b9f7e4a72f3a2998bb525ac7..fdee2bd6b562d42e3c488bd6ea0ececb99975964 100644
--- a/ui/views/animation/ink_drop_animation_controller_impl_unittest.cc
+++ b/ui/views/animation/ink_drop_animation_controller_impl_unittest.cc
@@ -138,4 +138,104 @@ TEST_F(InkDropAnimationControllerImplTest, HoverFadesOutOnSnapToActivated) {
   EXPECT_FALSE(test_api_.IsHoverFadingInOrVisible());
 }
 
+TEST_F(InkDropAnimationControllerImplTest, LayersRemovedFromHostAfterHover) {
+  ink_drop_host_.set_should_show_hover(true);
+
+  EXPECT_EQ(0, ink_drop_host_.num_ink_drop_layers());
+
+  ink_drop_animation_controller_.SetHovered(true);
+  EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers());
+
+  test_api_.CompleteAnimations();
+
+  ink_drop_animation_controller_.SetHovered(false);
+  EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers());
+
+  test_api_.CompleteAnimations();
+  EXPECT_EQ(0, ink_drop_host_.num_ink_drop_layers());
+}
+
+TEST_F(InkDropAnimationControllerImplTest, LayersRemovedFromHostAfterInkDrop) {
+  ink_drop_host_.set_should_show_hover(true);
+
+  EXPECT_EQ(0, ink_drop_host_.num_ink_drop_layers());
+
+  ink_drop_animation_controller_.AnimateToState(InkDropState::ACTION_PENDING);
+  EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers());
+
+  ink_drop_animation_controller_.AnimateToState(InkDropState::HIDDEN);
+  EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers());
+
+  test_api_.CompleteAnimations();
+  EXPECT_EQ(0, ink_drop_host_.num_ink_drop_layers());
+}
+
+TEST_F(InkDropAnimationControllerImplTest,
+       LayersAddedToHostWhenHoverOrInkDropVisible) {
+  ink_drop_host_.set_should_show_hover(true);
+
+  EXPECT_EQ(0, ink_drop_host_.num_ink_drop_layers());
+
+  ink_drop_animation_controller_.SetHovered(true);
+  EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers());
+
+  ink_drop_animation_controller_.AnimateToState(InkDropState::ACTION_PENDING);
+  EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers());
+
+  ink_drop_animation_controller_.AnimateToState(InkDropState::HIDDEN);
+  EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers());
+
+  test_api_.CompleteAnimations();
+  EXPECT_EQ(0, ink_drop_host_.num_ink_drop_layers());
+
+  EXPECT_TRUE(task_runner_->HasPendingTask());
+  task_runner_->RunPendingTasks();
+
+  // Hover should be fading back in.
+  EXPECT_TRUE(test_api_.HasActiveAnimations());
+  EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers());
+}
+
+TEST_F(InkDropAnimationControllerImplTest,
+       LayersNotAddedToHostWhenHoverTimeFires) {
+  ink_drop_host_.set_should_show_hover(true);
+
+  EXPECT_EQ(0, ink_drop_host_.num_ink_drop_layers());
+
+  ink_drop_animation_controller_.SetHovered(true);
+  EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers());
+
+  ink_drop_animation_controller_.AnimateToState(InkDropState::ACTION_PENDING);
+  EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers());
+
+  ink_drop_animation_controller_.AnimateToState(InkDropState::HIDDEN);
+  test_api_.CompleteAnimations();
+  EXPECT_EQ(0, ink_drop_host_.num_ink_drop_layers());
+
+  ink_drop_host_.set_should_show_hover(false);
+
+  EXPECT_TRUE(task_runner_->HasPendingTask());
+  task_runner_->RunPendingTasks();
+
+  EXPECT_EQ(0, ink_drop_host_.num_ink_drop_layers());
+}
+
+TEST_F(InkDropAnimationControllerImplTest,
+       LayersArentRemovedWhenPreemptingFadeOut) {
+  ink_drop_host_.set_should_show_hover(true);
+
+  EXPECT_EQ(0, ink_drop_host_.num_ink_drop_layers());
+
+  ink_drop_animation_controller_.SetHovered(true);
+  EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers());
+
+  test_api_.CompleteAnimations();
+
+  ink_drop_animation_controller_.SetHovered(false);
+  EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers());
+
+  ink_drop_animation_controller_.SetHovered(true);
+  EXPECT_EQ(1, ink_drop_host_.num_ink_drop_layers());
+}
+
 }  // namespace views