From d766aadae747d873b77dfcb436271eda5aa82f68 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 13 Feb 2018 12:03:37 -0800
Subject: [PATCH] Fix scrolling to first task on swipe up for RTL

Change-Id: I4f316bd6da7e7d370928accb41e1b44a689094af
---
 .../launcher3/uioverrides/RecentsViewStateController.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
index 9a5640bde6..57e588bd39 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
@@ -139,7 +139,9 @@ public class RecentsViewStateController implements StateHandler {
         applyProgress();
         if (mIsRecentsScrollingToFirstTask) {
             int scrollForFirstTask = mRecentsView.getScrollForPage(mRecentsView.getFirstTaskIndex());
-            mRecentsView.setScrollX((int) (mTransitionProgress.value * scrollForFirstTask));
+            int scrollForPage0 = mRecentsView.getScrollForPage(0);
+            mRecentsView.setScrollX((int) (mTransitionProgress.value * scrollForFirstTask
+                    + (1 - mTransitionProgress.value) * scrollForPage0));
         }
     }