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

Commit 474a3573 authored by Adam Cohen's avatar Adam Cohen Committed by Android (Google) Code Review
Browse files

Merge "Avoid stripping empty screens if the workspace is still loading (issue... 

Merge "Avoid stripping empty screens if the workspace is still loading (issue 12523285)" into ub-now-lunchbox
parents 8657bac9 517a7f5f

src/com/android/launcher3/Launcher.java

+6 −0
Original line number Diff line number Diff line
@@ -2078,6 +2078,10 @@ public class Launcher extends Activity 
        return mWorkspaceLoading || mWaitingForResult;

    }



    public boolean isWorkspaceLoading() {

        return mWorkspaceLoading;

    }



    private void resetAddInfo() {

        mPendingAddInfo.container = ItemInfo.NO_ID;

        mPendingAddInfo.screenId = -1;
@@ -3771,6 +3775,8 @@ public class Launcher extends Activity 
     * Implementation of the method from LauncherModel.Callbacks.

     */

    public void startBinding() {

        mWorkspaceLoading = true;



        // If we're starting binding all over again, clear any bind calls we'd postponed in

        // the past (see waitUntilResume) -- we don't need them since we're starting binding

        // from scratch again

src/com/android/launcher3/Workspace.java

+6 −0
Original line number Diff line number Diff line
@@ -863,6 +863,12 @@ public class Workspace extends SmoothPagedView 
        // Log to disk

        Launcher.addDumpLog(TAG, "11683562 - stripEmptyScreens()", true);



        if (isWorkspaceLoading()) {

            // Don't strip empty screens if the workspace is still loading

            Launcher.addDumpLog(TAG, "    - workspace loading, skip", true);

            return;

        }



        if (isPageMoving()) {

            mStripScreensOnPageStopMoving = true;

            return;