commit 43d984b766bbbf4d9505ef4c20384f8391664f93
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jan 30 18:41:36 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 30 18:41:36 2019 +0000
tree 903fd2a16915969c2688de42cab274a9fcccf485
parent b821d5dfee2ceecc2306639c41d174093fa4c0db
parent 44ecb9d7cbb5f02001bd703aa7aabd894898d3a2

Merge "Fix swiping up to Overview in landscape mode" into ub-launcher3-master

quickstep/src/com/android/quickstep/TouchInteractionService.java

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 164c9bd..d5de3ff 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -347,7 +347,8 @@
                         startTouchTracking(ev, true /* updateLocationOffset */);
                         break;
                     case ACTION_MOVE: {
-                        float displacement = ev.getY() - mDownPos.y;
+                        float displacement = mActivity.getDeviceProfile().isLandscape ?
+                                ev.getX() - mDownPos.x : ev.getY() - mDownPos.y;
                         if (Math.abs(displacement) >= mTouchSlop) {
                             // Start tracking only when mTouchSlop is crossed.
                             startTouchTracking(ev, true /* updateLocationOffset */);