commit a22c2b5d088135bed83ae4c21794bba038c2c55a
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Apr 19 23:48:40 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 19 23:48:40 2019 +0000
tree ac80286712a5fa3a809faf3747d15ca9827f24e3
parent 72eadbad8031cdcf8236d34eb0df2c11c4ed1c35
parent 52a0d7712e59fad61e0587d3e6f6abe3f8714f4b

Merge "Jump to the nearest page to launch when swiping down on shelf" into ub-launcher3-qt-dev

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java

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 5337c39..20a2487 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 @@
      * @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.");
         }