| commit | 467aba4870c0666641f82cb54ab895892655fa9e | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Fri Jul 17 01:44:35 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 17 01:44:35 2020 +0000 |
| tree | 1b245f2485fa54cdc7b9ec0d9970c1ee1bf36207 | |
| parent | d4a512eefd6f77bd6e4986d0f7316cc43f0d3582 [diff] | |
| parent | faea66fe888dad87014f0c13cd9b4d8c08322564 [diff] |
Ensuring workspace pages are offset properly in waterfall cutout am: faea66fe88 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12110121 Change-Id: I96925078c01137326fa2842dfbb5cd44b225f16b
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)); }