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

Commit b830b2d9 authored by Alex Chau's avatar Alex Chau Committed by Android (Google) Code Review
Browse files

Merge "Return mSynchronouslyBoundPages as getPagesToBindSynchronously between... 

Merge "Return mSynchronouslyBoundPages as getPagesToBindSynchronously between onInitialBindCompleteand finishBindingItems" into sc-v2-dev
parents 86ac4e45 49354043

src/com/android/launcher3/Launcher.java

+10 −2
Original line number Diff line number Diff line
@@ -2118,8 +2118,16 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche 


    @Override

    public IntSet getPagesToBindSynchronously(IntArray orderedScreenIds) {

        IntSet visibleIds = mPagesToBindSynchronously.isEmpty()

                ? mWorkspace.getCurrentPageScreenIds() : mPagesToBindSynchronously;

        IntSet visibleIds;

        if (!mPagesToBindSynchronously.isEmpty()) {

            visibleIds = mPagesToBindSynchronously;

        } else if (!mWorkspaceLoading) {

            visibleIds = mWorkspace.getCurrentPageScreenIds();

        } else {

            // If workspace binding is still in progress, getCurrentPageScreenIds won't be accurate,

            // and we should use mSynchronouslyBoundPages that's set during initial binding.

            visibleIds = mSynchronouslyBoundPages;

        }

        IntArray actualIds = new IntArray();



        IntSet result = new IntSet();