commit faea66fe888dad87014f0c13cd9b4d8c08322564
author Sunny Goyal <sunnygoyal@google.com> Tue Jul 07 13:02:19 2020 -0700
committer Sunny Goyal <sunnygoyal@google.com> Wed Jul 08 18:39:42 2020 +0000
tree 4f98a3559c912f10fc64dc4250cdfb7c5991efed
parent 1bab050df2530c50fc8d3d3e7501a5d294843d56

Ensuring workspace pages are offset properly in waterfall cutout

Bug: 149224750
Change-Id: I523b09aa4cbe7710e3fd89bc716bacbafd4eadc8

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 1441e0b..a6283ff 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -309,7 +309,9 @@
             // In portrait, we want the pages spaced such that there is no
             // overhang of the previous / next page into the current page viewport.
             // We assume symmetrical padding in portrait mode.
-            setPageSpacing(Math.max(grid.edgeMarginPx, padding.left + 1));
+            int maxInsets = Math.max(insets.left, insets.right);
+            int maxPadding = Math.max(grid.edgeMarginPx, padding.left + 1);
+            setPageSpacing(Math.max(maxInsets, maxPadding));
         }