commit efd15ca87b82e7bd15fae1eefb9f9f547de2e09c
author Thales Lima <tsuharesu@google.com> Wed Aug 25 12:33:00 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 25 12:33:00 2021 +0000
tree 41ed15cd1f5a0d824d822792b98b6f9c6d83f2ac
parent e494d082133d6f7fb57aa8538e86e74d7ce7d0d0
parent 46eaebba86b548a4cbc243b55e5fed62f72f0c41

Merge "workspace: get the correct page when setting paddings" into sc-v2-dev am: 653ae0a524 am: 46eaebba86

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

Change-Id: I652ac2aa0b8484e129e186d3576dfb30eb5d2eba

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 38beeea..42b2033 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -333,7 +333,8 @@
         int paddingBottom = grid.cellLayoutBottomPaddingPx;
 
         int panelCount = getPanelCount();
-        for (int i = mWorkspaceScreens.size() - 1; i >= 0; i--) {
+        int numberOfScreens = mScreenOrder.size();
+        for (int i = 0; i < numberOfScreens; i++) {
             int paddingLeft = paddingLeftRight;
             int paddingRight = paddingLeftRight;
             if (panelCount > 1) {
@@ -348,7 +349,9 @@
                     paddingRight = 0;
                 }
             }
-            mWorkspaceScreens.valueAt(i).setPadding(paddingLeft, 0, paddingRight, paddingBottom);
+            // SparseArrayMap doesn't keep the order
+            mWorkspaceScreens.get(mScreenOrder.get(i))
+                    .setPadding(paddingLeft, 0, paddingRight, paddingBottom);
         }
     }