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

Unified Diff: athena/home/athena_start_page_view.cc

Issue 582923002: Do not EASE_IN_OUT after fling, rather EASE_OUT. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 6 years, 3 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 | « athena/home/athena_start_page_view.h ('k') | athena/home/home_card_gesture_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/home/athena_start_page_view.cc
diff --git a/athena/home/athena_start_page_view.cc b/athena/home/athena_start_page_view.cc
index 098b141277c37b57e2bf3e1501b497a4215c4c2d..4a6510067d69b9cdd68a41947e45cc6da20d13f7 100644
--- a/athena/home/athena_start_page_view.cc
+++ b/athena/home/athena_start_page_view.cc
@@ -246,7 +246,9 @@ void AthenaStartPageView::SetLayoutState(float layout_state) {
Layout();
}
-void AthenaStartPageView::SetLayoutStateWithAnimation(float layout_state) {
+void AthenaStartPageView::SetLayoutStateWithAnimation(
+ float layout_state,
+ gfx::Tween::Type tween_type) {
ui::ScopedLayerAnimationSettings system_info(
system_info_view_->layer()->GetAnimator());
ui::ScopedLayerAnimationSettings logo(logo_->layer()->GetAnimator());
@@ -257,11 +259,11 @@ void AthenaStartPageView::SetLayoutStateWithAnimation(float layout_state) {
ui::ScopedLayerAnimationSettings controls(
control_icon_container_->layer()->GetAnimator());
- system_info.SetTweenType(gfx::Tween::EASE_IN_OUT);
- logo.SetTweenType(gfx::Tween::EASE_IN_OUT);
- search_box.SetTweenType(gfx::Tween::EASE_IN_OUT);
- icons.SetTweenType(gfx::Tween::EASE_IN_OUT);
- controls.SetTweenType(gfx::Tween::EASE_IN_OUT);
+ system_info.SetTweenType(tween_type);
+ logo.SetTweenType(tween_type);
+ search_box.SetTweenType(tween_type);
+ icons.SetTweenType(tween_type);
+ controls.SetTweenType(tween_type);
SetLayoutState(layout_state);
}
« no previous file with comments | « athena/home/athena_start_page_view.h ('k') | athena/home/home_card_gesture_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698