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

Commit e8ec58f9 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Revert "Synchronizing loader preload to avoid launcher getting stuck in... 

Merge "Revert "Synchronizing loader preload to avoid launcher getting stuck in loading state,"" into ub-launcher3-master
parents 6485766b 73aa3025

src/com/android/launcher3/LauncherModel.java

+0 −9
Original line number Diff line number Diff line
@@ -493,15 +493,6 @@ public class LauncherModel extends BroadcastReceiver 
        }

    }



    public void startLoaderForResultsIfNotLoaded(LoaderResults results) {

        synchronized (mLock) {

            if (!isModelLoaded()) {

                Log.d(TAG, "Workspace not loaded, loading now");

                startLoaderForResults(results);

            }

        }

    }



    /**

     * Loads the workspace screen ids in an ordered list.

     */

src/com/android/launcher3/model/ModelPreload.java

+5 −2
Original line number Diff line number Diff line
@@ -49,8 +49,11 @@ public class ModelPreload implements ModelUpdateTask { 


    @Override

    public final void run() {

        mModel.startLoaderForResultsIfNotLoaded(

        if (!mModel.isModelLoaded()) {

            Log.d(TAG, "Workspace not loaded, loading now");

            mModel.startLoaderForResults(

                    new LoaderResults(mApp, mBgDataModel, mAllAppsList, 0, null));

        }

        Log.d(TAG, "Preload completed : " + mModel.isModelLoaded());

        onComplete(mModel.isModelLoaded());

    }