Index: ash/wm/overview/scoped_overview_animation_settings_aura.cc |
diff --git a/ash/wm/overview/scoped_overview_animation_settings_aura.cc b/ash/wm/overview/scoped_overview_animation_settings_aura.cc |
index f3c23da247a1d922f09bbeeb2222579b1f72da25..c65d14991d78d1eb1963c6a6da69abe22951cda4 100644 |
--- a/ash/wm/overview/scoped_overview_animation_settings_aura.cc |
+++ b/ash/wm/overview/scoped_overview_animation_settings_aura.cc |
@@ -16,6 +16,9 @@ namespace { |
// The time duration for transformation animations. |
const int kTransitionMilliseconds = 200; |
+// The time duration for layout update. Only different with Material Design; |
tdanderson
2016/06/28 15:28:02
nit: ;
Also reading this I find "only different w
varkha
2016/06/28 23:50:37
Done.
|
+const int kCloseTransitionMillisecondsMD = 200; |
tdanderson
2016/06/28 15:28:02
nit: it was suggested to me in a separate CL to us
varkha
2016/06/28 23:50:37
Done.
|
+ |
// The time duration for widgets to fade in. |
const int kFadeInMilliseconds = 80; |
@@ -29,6 +32,8 @@ base::TimeDelta GetAnimationDuration(OverviewAnimationType animation_type) { |
case OVERVIEW_ANIMATION_RESTORE_WINDOW: |
case OVERVIEW_ANIMATION_HIDE_WINDOW: |
return base::TimeDelta::FromMilliseconds(kTransitionMilliseconds); |
+ case OVERVIEW_ANIMATION_CLOSE_SELECTOR_ITEM: |
+ return base::TimeDelta::FromMilliseconds(kCloseTransitionMillisecondsMD); |
} |
NOTREACHED(); |
return base::TimeDelta(); |
@@ -59,6 +64,11 @@ ScopedOverviewAnimationSettingsAura::ScopedOverviewAnimationSettingsAura( |
ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET); |
animation_settings_.SetTweenType(gfx::Tween::FAST_OUT_SLOW_IN); |
break; |
+ case OVERVIEW_ANIMATION_CLOSE_SELECTOR_ITEM: |
+ animation_settings_.SetPreemptionStrategy( |
+ ui::LayerAnimator::ENQUEUE_NEW_ANIMATION); |
+ animation_settings_.SetTweenType(gfx::Tween::EASE_OUT); |
+ break; |
case OVERVIEW_ANIMATION_HIDE_WINDOW: |
animation_settings_.SetPreemptionStrategy( |
ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET); |