commit 4ade3fd561e357744c41da715d4dfda65f2fee9e
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Aug 07 00:10:05 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 07 00:10:05 2020 +0000
tree de3eddc61984371a85c7cf171b4fef57a7bddd9a
parent 8ccd877f424070dbf5bec170722d46cea40bf827
parent 3f20e33af652f8ecdd729d3f861bf6d95e3f1fa0

Merge "Fix adjacent page offset in landscape orientation" into ub-launcher3-rvc-qpr-dev am: 3f20e33af6

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12327711

Change-Id: I8f2da96439372a9f6671469c3c41e4c0a43a4067

quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
index 9393e08..3119f56 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
@@ -1890,7 +1890,9 @@
                     : i < modalMidpoint
                             ? modalLeftOffsetSize
                             : modalRightOffsetSize;
-            getChildAt(i).setTranslationX(translation + modalTranslation);
+            float totalTranslation = translation + modalTranslation;
+            mOrientationHandler.getPrimaryViewTranslate().set(getChildAt(i),
+                    totalTranslation * mOrientationHandler.getPrimaryTranslationDirectionFactor());
         }
         updateCurveProperties();
     }

src/com/android/launcher3/touch/LandscapePagedViewHandler.java

diff --git a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
index d4ea3b9..d98e572 100644
--- a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
+++ b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java
@@ -216,6 +216,11 @@
     }
 
     @Override
+    public int getPrimaryTranslationDirectionFactor() {
+        return -1;
+    }
+
+    @Override
     public int getTaskDismissDirectionFactor() {
         return 1;
     }

src/com/android/launcher3/touch/PagedOrientationHandler.java

diff --git a/src/com/android/launcher3/touch/PagedOrientationHandler.java b/src/com/android/launcher3/touch/PagedOrientationHandler.java
index 9c84345..b3b0dc1 100644
--- a/src/com/android/launcher3/touch/PagedOrientationHandler.java
+++ b/src/com/android/launcher3/touch/PagedOrientationHandler.java
@@ -75,6 +75,7 @@
     int getScrollOffsetStart(View view, Rect insets);
     int getScrollOffsetEnd(View view, Rect insets);
     SingleAxisSwipeDetector.Direction getOppositeSwipeDirection();
+    int getPrimaryTranslationDirectionFactor();
     int getTaskDismissDirectionFactor();
     int getTaskDragDisplacementFactor(boolean isRtl);
     ChildBounds getChildBounds(View child, int childStart, int pageCenter, boolean layoutChild);

src/com/android/launcher3/touch/PortraitPagedViewHandler.java

diff --git a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
index fd881e7..c0690fc 100644
--- a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
+++ b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java
@@ -213,6 +213,11 @@
     }
 
     @Override
+    public int getPrimaryTranslationDirectionFactor() {
+        return 1;
+    }
+
+    @Override
     public int getTaskDismissDirectionFactor() {
         return -1;
     }