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

Unified Diff: ash/shelf/voice_interaction_overlay.cc

Issue 2947843005: Update voice interaction animation (Closed)
Patch Set: Created 3 years, 6 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
« no previous file with comments | « no previous file | ui/gfx/animation/tween.h » ('j') | ui/gfx/animation/tween.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/voice_interaction_overlay.cc
diff --git a/ash/shelf/voice_interaction_overlay.cc b/ash/shelf/voice_interaction_overlay.cc
index 21602386fd8dbc24ae56d1e309ceee5eaf5e5ec6..ad9447d5fe41001a5a1420ba34a8adecbf3cea1e 100644
--- a/ash/shelf/voice_interaction_overlay.cc
+++ b/ash/shelf/voice_interaction_overlay.cc
@@ -381,7 +381,7 @@ void VoiceInteractionOverlay::EndAnimation() {
IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
settings.SetTransitionDuration(
base::TimeDelta::FromMilliseconds(kFullRetractDurationMs));
- settings.SetTweenType(gfx::Tween::LINEAR_OUT_SLOW_IN);
+ settings.SetTweenType(gfx::Tween::SLOW_OUT_LINEAR_IN);
ripple_layer_->SetTransform(transform);
@@ -405,7 +405,7 @@ void VoiceInteractionOverlay::EndAnimation() {
IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
settings.SetTransitionDuration(
base::TimeDelta::FromMilliseconds(kFullRetractDurationMs));
- settings.SetTweenType(gfx::Tween::LINEAR_OUT_SLOW_IN);
+ settings.SetTweenType(gfx::Tween::SLOW_OUT_LINEAR_IN);
icon_layer_->SetTransform(transform);
icon_layer_->SetOpacity(0);
@@ -426,7 +426,7 @@ void VoiceInteractionOverlay::EndAnimation() {
IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
settings.SetTransitionDuration(
base::TimeDelta::FromMilliseconds(kFullRetractDurationMs));
- settings.SetTweenType(gfx::Tween::LINEAR_OUT_SLOW_IN);
+ settings.SetTweenType(gfx::Tween::SLOW_OUT_LINEAR_IN);
background_layer_->SetTransform(transform);
background_layer_->SetOpacity(0);
« no previous file with comments | « no previous file | ui/gfx/animation/tween.h » ('j') | ui/gfx/animation/tween.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698