Do not EASE_IN_OUT after fling, rather EASE_OUT.

athena/home/home_card_gesture_manager_unittest.cc

 // Copyright 2014 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 "athena/home/home_card_gesture_manager.h"
 
 #include "athena/home/home_card_constants.h"
 #include "athena/home/public/home_card.h"
 #include "athena/test/athena_test_base.h"
 #include "base/time/time.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 
 namespace athena {
 
 class HomeCardGestureManagerTest : public test::AthenaTestBase,
                                    public HomeCardGestureManager::Delegate {
  public:
   HomeCardGestureManagerTest()
       : final_state_(HomeCard::HIDDEN),
         last_from_state_(HomeCard::HIDDEN),
         last_to_state_(HomeCard::HIDDEN),
         last_progress_(0.0f),
+        was_fling_(false),
         last_y_(0),
         progress_count_(0),
         end_count_(0) {}
   virtual ~HomeCardGestureManagerTest() {}
 
   // testing::Test:
   virtual void SetUp() OVERRIDE {
     test::AthenaTestBase::SetUp();
     gesture_manager_.reset(new HomeCardGestureManager(this, screen_bounds()));
   }
@@ skipping 41 matching lines @@
   }
 
   int screen_height() const {
     return screen_bounds().height();
   }
 
   HomeCard::State final_state_;
   HomeCard::State last_from_state_;
   HomeCard::State last_to_state_;
   float last_progress_;
+  bool was_fling_;
 
  private:
   gfx::Rect screen_bounds() const {
     return gfx::Rect(0, 0, 1280, 1024);
   }
 
   // HomeCardGestureManager::Delegate:
-  virtual void OnGestureEnded(HomeCard::State final_state) OVERRIDE {
+  virtual void OnGestureEnded(HomeCard::State final_state,
+                              bool is_fling) OVERRIDE {
     final_state_ = final_state;
+    was_fling_ = is_fling;
     ++end_count_;
   }
 
   virtual void OnGestureProgressed(HomeCard::State from_state,
                                    HomeCard::State to_state,
                                    float progress) OVERRIDE {
     last_from_state_ = from_state;
     last_to_state_ = to_state;
     last_progress_ = progress;
     ++progress_count_;
@@ skipping 51 matching lines @@
   EXPECT_LT(progress_800, last_progress_);
 
   ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE, 810);
   EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, last_from_state_);
   EXPECT_EQ(HomeCard::VISIBLE_CENTERED, last_to_state_);
   EXPECT_GT(progress_800, last_progress_);
 
   EXPECT_TRUE(ProcessGestureEvent(ui::ET_GESTURE_SCROLL_END, 810));
   EXPECT_EQ(1, GetEndCountAndReset());
   EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, final_state_);
+  EXPECT_FALSE(was_fling_);
 }
 
 // Test gesture progress when the gesture is initiated when the home card is in
 // the centered state.
 TEST_F(HomeCardGestureManagerTest, StartCentered) {
   HomeCard::Get()->SetState(HomeCard::VISIBLE_CENTERED);
 
   EXPECT_TRUE(ProcessGestureEvent(ui::ET_GESTURE_SCROLL_BEGIN, 20));
 
   ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE, 10);
@@ skipping 38 matching lines @@
   ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE, 1000);
   EXPECT_TRUE(ProcessGestureEvent(ui::ET_GESTURE_SCROLL_END, 1000));
   EXPECT_EQ(1, GetEndCountAndReset());
   EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, final_state_);
 
   EXPECT_TRUE(ProcessGestureEvent(ui::ET_GESTURE_SCROLL_BEGIN, 950));
   ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE, 300);
   EXPECT_TRUE(ProcessGestureEvent(ui::ET_GESTURE_SCROLL_END, 300));
   EXPECT_EQ(1, GetEndCountAndReset());
   EXPECT_EQ(HomeCard::VISIBLE_CENTERED, final_state_);
+  EXPECT_FALSE(was_fling_);
 }
 
 TEST_F(HomeCardGestureManagerTest, FlingUpAtEnd) {
   ASSERT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
 
   EXPECT_TRUE(ProcessGestureEvent(ui::ET_GESTURE_SCROLL_BEGIN, 1020));
   EXPECT_EQ(0, GetEndCountAndReset());
   EXPECT_EQ(0, GetProgressCountAndReset());
 
   ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE, 1010);
   ProcessFlingGesture(-150.0f);
   EXPECT_EQ(1, GetEndCountAndReset());
   EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, final_state_);
+  EXPECT_TRUE(was_fling_);
 }
 
 TEST_F(HomeCardGestureManagerTest, FlingDownAtEnd) {
   HomeCard::Get()->SetState(HomeCard::VISIBLE_CENTERED);
 
   EXPECT_TRUE(ProcessGestureEvent(ui::ET_GESTURE_SCROLL_BEGIN, 20));
   EXPECT_EQ(0, GetEndCountAndReset());
   EXPECT_EQ(0, GetProgressCountAndReset());
 
   ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE, 30);
   ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE, 100);
   ProcessFlingGesture(150.0f);
   EXPECT_EQ(1, GetEndCountAndReset());
   EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, final_state_);
+  EXPECT_TRUE(was_fling_);
 }
 
 TEST_F(HomeCardGestureManagerTest, WeakFling) {
   ASSERT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
 
   EXPECT_TRUE(ProcessGestureEvent(ui::ET_GESTURE_SCROLL_BEGIN, 1020));
   EXPECT_EQ(0, GetEndCountAndReset());
   EXPECT_EQ(0, GetProgressCountAndReset());
 
   ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE, 1010);
   ProcessFlingGesture(-30.0f);
   EXPECT_EQ(1, GetEndCountAndReset());
   EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, final_state_);
+  EXPECT_FALSE(was_fling_);
 }
 
 // Test the situation where the user intends a single fling but the finger
 // touches the screen long enough, so that the home card becomes bigger than the
 // height of VISIBLE_BOTTOM state due to the scroll events.
 // In this case the fling event should not change the final state from
 // VISIBLE_BOTTOM to VISIBLE_CENTERED because the user's intention was a single
 // fling. See http://crbug.com/415211
 TEST_F(HomeCardGestureManagerTest, FastFling) {
   ASSERT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
 
   EXPECT_TRUE(ProcessGestureEvent(ui::ET_GESTURE_SCROLL_BEGIN, 1020));
   EXPECT_EQ(0, GetEndCountAndReset());
   EXPECT_EQ(0, GetProgressCountAndReset());
 
   ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE, 1010);
   ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE,
                       screen_height() - kHomeCardHeight);
   ProcessFlingGesture(-150.0f);
   EXPECT_EQ(1, GetEndCountAndReset());
   EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, final_state_);
+  EXPECT_TRUE(was_fling_);
 }
 
 }  // namespace athena