From faea66fe888dad87014f0c13cd9b4d8c08322564 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 7 Jul 2020 13:02:19 -0700
Subject: [PATCH] Ensuring workspace pages are offset properly in waterfall
 cutout

Bug: 149224750
Change-Id: I523b09aa4cbe7710e3fd89bc716bacbafd4eadc8
---
 src/com/android/launcher3/Workspace.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 1441e0b93b..a6283ff253 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -309,7 +309,9 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
             // 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));
         }