app_list: Touch scroll and animation improvement.

ui/app_list/contents_view.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 "ui/app_list/contents_view.h"
 
 #include <algorithm>
 
 #include "ui/app_list/app_list_view.h"
 #include "ui/app_list/apps_grid_view.h"
@@ skipping 13 matching lines @@
 const int kPreferredCols = 4;
 const int kPreferredRows = 4;
 
 // Indexes of interesting views in ViewModel of ContentsView.
 const int kIndexAppsGrid = 0;
 const int kIndexPageSwitcher = 1;
 const int kIndexSearchResults = 2;
 
 const int kMinMouseWheelToSwitchPage = 20;
 const int kMinScrollToSwitchPage = 20;
-const int kMinHorizVelocityToSwitchPage = 1100;
+const int kMinHorizVelocityToSwitchPage = 800;
+
+const double kFinishTransitionThreshold = 0.33;
+const int kTransitionAnimationDurationInMs = 180;
 
 // Helpers to get certain child view from |model|.
 AppsGridView* GetAppsGridView(views::ViewModel* model) {
   return static_cast<AppsGridView*>(model->view_at(kIndexAppsGrid));
 }
 
 PageSwitcher* GetPageSwitcherView(views::ViewModel* model) {
   return static_cast<PageSwitcher*>(model->view_at(kIndexPageSwitcher));
 }
 
 SearchResultListView* GetSearchResultListView(views::ViewModel* model) {
   return static_cast<SearchResultListView*>(
       model->view_at(kIndexSearchResults));
 }
 
 }  // namespace
 
 ContentsView::ContentsView(AppListView* app_list_view,
                            PaginationModel* pagination_model)
     : show_state_(SHOW_APPS),
       pagination_model_(pagination_model),
       view_model_(new views::ViewModel),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           bounds_animator_(new views::BoundsAnimator(this))) {
+  pagination_model_->SetTransitionDuration(kTransitionAnimationDurationInMs);
+
   AppsGridView* apps_grid_view = new AppsGridView(app_list_view,
                                                   pagination_model);
   apps_grid_view->SetLayout(kPreferredIconDimension,
                             kPreferredCols,
                             kPreferredRows);
   AddChildView(apps_grid_view);
   view_model_->Add(apps_grid_view, kIndexAppsGrid);
 
   PageSwitcher* page_switcher_view = new PageSwitcher(pagination_model);
   AddChildView(page_switcher_view);
@@ skipping 126 matching lines @@
     case ui::ET_GESTURE_SCROLL_BEGIN:
       pagination_model_->StartScroll();
       return ui::GESTURE_STATUS_CONSUMED;
     case ui::ET_GESTURE_SCROLL_UPDATE:
       // event.details.scroll_x() > 0 means moving contents to right. That is,
       // transitioning to previous page.
       pagination_model_->UpdateScroll(
           event.details().scroll_x() / GetContentsBounds().width());
       return ui::GESTURE_STATUS_CONSUMED;
     case ui::ET_GESTURE_SCROLL_END:
-      pagination_model_->EndScroll();
+      pagination_model_->EndScroll(pagination_model_->
+          transition().progress < kFinishTransitionThreshold);
       return ui::GESTURE_STATUS_CONSUMED;
     case ui::ET_SCROLL_FLING_START: {
-      pagination_model_->EndScroll();
+      pagination_model_->EndScroll(true);
       if (fabs(event.details().velocity_x()) > kMinHorizVelocityToSwitchPage) {
-        pagination_model_->ResetTransitionAnimation();
         pagination_model_->SelectPageRelative(
             event.details().velocity_x() < 0 ? 1 : -1,
             true);
       }
       return ui::GESTURE_STATUS_CONSUMED;
     }
     default:
       break;
   }
 
@@ skipping 34 matching lines @@
       pagination_model_->SelectPageRelative(event.x_offset() > 0 ? -1 : 1,
                                             true);
     }
     return true;
   }
 
   return false;
 }
 
 }  // namespace app_list