Revert "Merging from ub-launcher3-rvc-qpr-dev @ build 6690853"

Revert "Merging from ub-launcher3-rvc-qpr-dev @ build 6690853" Revert "Merging from ub-launcher3-rvc-qpr-dev @ build 6690853" Revert submission 12190253-merge_ub-launcher3-rvc-qpr-dev_6690853 Reason for revert: Build ID picked from ub-launcher3-master and not ub-launcher3-rvc-qpr-dev Reverted Changes: I9e658ece0:Merging from ub-launcher3-rvc-qpr-dev @ build 6690... I2a47fe180:Merging from ub-launcher3-rvc-qpr-dev @ build 6690... Ie86b0a2e0:Merging from ub-launcher3-rvc-qpr-dev @ build 6690... Id3ca76da6:Merging from ub-launcher3-rvc-qpr-dev @ build 6690... Ib6a63da0f:Merging from ub-launcher3-rvc-qpr-dev @ build 6690... Bug: 162366734 Change-Id: Ie81853a34c9a48d5b3fd922c65483a9ff639e0ce Merged-In: Ibff46b3ef7ff89accb459db323f31179adb4ef21
2020-07-25 00:30:36 +00:00
parent 65b16d6db2
commit 0a4a4d920e
102 changed files with 1228 additions and 1498 deletions
@@ -309,9 +309,7 @@ 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.
-            int maxInsets = Math.max(insets.left, insets.right);
-            int maxPadding = Math.max(grid.edgeMarginPx, padding.left + 1);
-            setPageSpacing(Math.max(maxInsets, maxPadding));
+            setPageSpacing(Math.max(grid.edgeMarginPx, padding.left + 1));
        }