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

Unified Diff: athena/home/home_card_gesture_manager.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/home_card_gesture_manager.h ('k') | athena/home/home_card_gesture_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/home/home_card_gesture_manager.cc
diff --git a/athena/home/home_card_gesture_manager.cc b/athena/home/home_card_gesture_manager.cc
index fae4e264e13d9f0478f84170c88e30f25fe22124..e08731789cbe092bcea99521fdb021e9c29b8dfa 100644
--- a/athena/home/home_card_gesture_manager.cc
+++ b/athena/home/home_card_gesture_manager.cc
@@ -50,7 +50,7 @@ void HomeCardGestureManager::ProcessGestureEvent(ui::GestureEvent* event) {
break;
case ui::ET_GESTURE_SCROLL_END:
event->SetHandled();
- delegate_->OnGestureEnded(GetFinalState());
+ delegate_->OnGestureEnded(GetFinalState(), false);
break;
case ui::ET_GESTURE_SCROLL_UPDATE:
UpdateScrollState(*event);
@@ -68,8 +68,8 @@ void HomeCardGestureManager::ProcessGestureEvent(ui::GestureEvent* event) {
// moved the home card (e.g. drag home card up from minimized state and
// then fling down)
// TODO(mukai): Consider this case once reported.
- if (final_state == original_state_ &&
- ::fabs(details.velocity_y()) > kFlingCompletionVelocity) {
+ bool is_fling = ::fabs(details.velocity_y()) > kFlingCompletionVelocity;
+ if (final_state == original_state_ && is_fling) {
if (details.velocity_y() > 0) {
final_state = std::min(HomeCard::VISIBLE_MINIMIZED,
static_cast<HomeCard::State>(final_state + 1));
@@ -78,7 +78,7 @@ void HomeCardGestureManager::ProcessGestureEvent(ui::GestureEvent* event) {
static_cast<HomeCard::State>(final_state - 1));
}
}
- delegate_->OnGestureEnded(final_state);
+ delegate_->OnGestureEnded(final_state, is_fling);
break;
}
default:
« no previous file with comments | « athena/home/home_card_gesture_manager.h ('k') | athena/home/home_card_gesture_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698