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

Unified Diff: ui/app_list/views/folder_background_view.cc

Issue 162363002: Use the new animation tween type for app list folder animation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 | « ui/app_list/views/apps_grid_view.cc ('k') | ui/app_list/views/top_icon_animation_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/folder_background_view.cc
diff --git a/ui/app_list/views/folder_background_view.cc b/ui/app_list/views/folder_background_view.cc
index ebb3c12f4ad9188b3ed41d96c8ce00bc1ecdc9b8..5c033728a8b3b2f5b9897b311db2d84982204968 100644
--- a/ui/app_list/views/folder_background_view.cc
+++ b/ui/app_list/views/folder_background_view.cc
@@ -55,9 +55,11 @@ void FolderBackgroundView::UpdateFolderContainerBubble(ShowState state) {
settings.SetTransitionDuration(
base::TimeDelta::FromMilliseconds((kBubbleTransitionDurationMs)));
if (show_state_ == SHOW_BUBBLE) {
+ settings.SetTweenType(gfx::Tween::EASE_OUT_2);
layer()->SetOpacity(1.0f);
layer()->SetTransform(gfx::Transform());
} else {
+ settings.SetTweenType(gfx::Tween::EASE_IN_3);
layer()->SetOpacity(0.0f);
layer()->SetTransform(transform);
}
« no previous file with comments | « ui/app_list/views/apps_grid_view.cc ('k') | ui/app_list/views/top_icon_animation_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698