Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efd15ca8 authored by Thales Lima's avatar Thales Lima Committed by Automerger Merge Worker
Browse files

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

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

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

Change-Id: I652ac2aa0b8484e129e186d3576dfb30eb5d2eba
parents e494d082 46eaebba

src/com/android/launcher3/Workspace.java

+5 −2
Original line number Diff line number Diff line
@@ -333,7 +333,8 @@ public class Workspace extends PagedView<WorkspacePageIndicator> 
        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 @@ public class Workspace extends PagedView<WorkspacePageIndicator> 
                    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);

        }

    }