app_list: Make over scroll animation faster.

ash/wm/app_list_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/app_list_controller.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/shelf_layout_manager.h"
+#include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_view.h"
 #include "ui/app_list/pagination_model.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/events/event.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/transform_util.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace internal {
 
 namespace {
 
 // Duration for show/hide animation in milliseconds.
 const int kAnimationDurationMs = 200;
 
 // Offset in pixels to animation away/towards the launcher.
 const int kAnimationOffset = 8;
 
-// Duration for snap back animation after over-scroll in milliseconds.
-const int kSnapBackAnimationDurationMs = 100;
-
 // The maximum shift in pixels when over-scroll happens.
 const int kMaxOverScrollShift = 48;
 
 ui::Layer* GetLayer(views::Widget* widget) {
   return widget->GetNativeView()->layer();
 }
 
 // Gets arrow location based on shelf alignment.
 views::BubbleBorder::ArrowLocation GetBubbleArrowLocation(
     aura::Window* window) {
@@ skipping 292 matching lines @@
   // |view_| could be NULL when app list is closed with a running transition.
   if (!view_)
     return;
 
   const app_list::PaginationModel::Transition& transition =
       pagination_model_->transition();
   if (pagination_model_->is_valid_page(transition.target_page))
     return;
 
   views::Widget* widget = view_->GetWidget();
+  ui::LayerAnimator* widget_animator = GetLayer(widget)->GetAnimator();
   if (!pagination_model_->IsRevertingCurrentTransition()) {
-    // Update cached |view_bounds_| before the first over-scroll move.
-    if (!should_snap_back_)
+    // Update cached |view_bounds_| if it is the first over-scroll move and
+    // widget does not have running animations.
+    if (!should_snap_back_ && !widget_animator->is_animating())
       view_bounds_ = widget->GetWindowBoundsInScreen();
 
     const int current_page = pagination_model_->selected_page();
     const int dir = transition.target_page > current_page ? -1 : 1;
 
     const double progress = 1.0 - pow(1.0 - transition.progress, 4);
     const int shift = kMaxOverScrollShift * progress * dir;
 
     gfx::Rect shifted(view_bounds_);
     shifted.set_x(shifted.x() + shift);
     widget->SetBounds(shifted);
     should_snap_back_ = true;
   } else if (should_snap_back_) {
     should_snap_back_ = false;
-    ui::ScopedLayerAnimationSettings animation(GetLayer(widget)->GetAnimator());
-    animation.SetTransitionDuration(
-        base::TimeDelta::FromMilliseconds(kSnapBackAnimationDurationMs));
+    ui::ScopedLayerAnimationSettings animation(widget_animator);
+    animation.SetTransitionDuration(base::TimeDelta::FromMilliseconds(
+        app_list::kOverscrollPageTransitionDurationMs));
     widget->SetBounds(view_bounds_);
   }
 }
 
 }  // namespace internal
 }  // namespace ash