PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I42a42640bbffa3fa4edb7f01494f9b97423be336
This commit is contained in:
Thales Lima
2021-08-25 12:16:15 +00:00
committed by Automerger Merge Worker
parent f261ef2291 653ae0a524
commit 46eaebba86
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/Workspace.java
+5 -2
View File
@@ -333,7 +333,8 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
int paddingBottom = grid.cellLayoutBottomPaddingPx; int paddingBottom = grid.cellLayoutBottomPaddingPx;
int panelCount = getPanelCount(); 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 paddingLeft = paddingLeftRight;
int paddingRight = paddingLeftRight; int paddingRight = paddingLeftRight;
if (panelCount > 1) { if (panelCount > 1) {
@@ -348,7 +349,9 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
paddingRight = 0; 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);
} }
} }