From 52a0d7712e59fad61e0587d3e6f6abe3f8714f4b Mon Sep 17 00:00:00 2001
From: Tony <twickham@google.com>
Date: Fri, 19 Apr 2019 16:34:30 -0700
Subject: [PATCH] Jump to the nearest page to launch when swiping down on shelf

Bug: 78240090
Change-Id: I1e26f66242fa3b45a4b6241721f0ff0465770aaf
---
 .../touchcontrollers/PortraitOverviewStateTouchHelper.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java
index 5337c39eee..20a2487349 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java
@@ -75,7 +75,8 @@ public final class PortraitOverviewStateTouchHelper {
      * @return the animation
      */
     PendingAnimation createSwipeDownToTaskAppAnimation(long duration) {
-        TaskView taskView = mRecentsView.getTaskViewAt(mRecentsView.getNextPage());
+        mRecentsView.setCurrentPage(mRecentsView.getPageNearestToCenterOfScreen());
+        TaskView taskView = mRecentsView.getTaskViewAt(mRecentsView.getCurrentPage());
         if (taskView == null) {
             throw new IllegalStateException("There is no task view to animate to.");
         }