| Index: ui/views/animation/square_ink_drop_animation.cc
|
| diff --git a/ui/views/animation/square_ink_drop_animation.cc b/ui/views/animation/square_ink_drop_animation.cc
|
| index eb6890e1f7f9fb3920fc193ce7537ecd694e2c16..5d78b43292b021c2004099efbff8dbdfeb76fda7 100644
|
| --- a/ui/views/animation/square_ink_drop_animation.cc
|
| +++ b/ui/views/animation/square_ink_drop_animation.cc
|
| @@ -195,6 +195,14 @@ SquareInkDropAnimation::~SquareInkDropAnimation() {
|
| AbortAllAnimations();
|
| }
|
|
|
| +void SquareInkDropAnimation::SnapToActivated() {
|
| + InkDropAnimation::SnapToActivated();
|
| + SetOpacity(kVisibleOpacity);
|
| + InkDropTransforms transforms;
|
| + GetActivatedTargetTransforms(&transforms);
|
| + SetTransforms(transforms);
|
| +}
|
| +
|
| ui::Layer* SquareInkDropAnimation::GetRootLayer() {
|
| return &root_layer_;
|
| }
|
| @@ -269,6 +277,10 @@ void SquareInkDropAnimation::AnimateStateChange(
|
| case InkDropState::QUICK_ACTION: {
|
| DCHECK(old_ink_drop_state == InkDropState::HIDDEN ||
|
| old_ink_drop_state == InkDropState::ACTION_PENDING);
|
| + if (old_ink_drop_state == InkDropState::HIDDEN) {
|
| + AnimateStateChange(old_ink_drop_state, InkDropState::ACTION_PENDING,
|
| + animation_observer);
|
| + }
|
| AnimateToOpacity(kHiddenOpacity,
|
| GetAnimationDuration(QUICK_ACTION_FADE_OUT),
|
| ui::LayerAnimator::ENQUEUE_NEW_ANIMATION,
|
| @@ -333,7 +345,7 @@ void SquareInkDropAnimation::AnimateStateChange(
|
| ui::LayerAnimator::ENQUEUE_NEW_ANIMATION;
|
| }
|
|
|
| - CalculateRectTransforms(small_size_, small_corner_radius_, &transforms);
|
| + GetActivatedTargetTransforms(&transforms);
|
| AnimateToTransforms(transforms,
|
| GetAnimationDuration(ACTIVATED_RECT_TRANSFORM),
|
| rect_transform_preemption_strategy,
|
| @@ -498,6 +510,11 @@ void SquareInkDropAnimation::GetCurrentTransforms(
|
| (*transforms_out)[i] = painted_layers_[i]->transform();
|
| }
|
|
|
| +void SquareInkDropAnimation::GetActivatedTargetTransforms(
|
| + InkDropTransforms* transforms_out) const {
|
| + CalculateRectTransforms(small_size_, small_corner_radius_, transforms_out);
|
| +}
|
| +
|
| void SquareInkDropAnimation::AddPaintLayer(PaintedShape painted_shape) {
|
| ui::LayerDelegate* delegate = nullptr;
|
| switch (painted_shape) {
|
|
|