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

Commit 60484e3e authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixing async inflation not happening for first page" into main

parents 16cad65a e5a95ed1

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

+9 −3
Original line number Diff line number Diff line
@@ -311,9 +311,16 @@ public abstract class BaseLauncherBinder { 
            // Bind workspace screens

            executeCallbacksTask(c -> c.bindScreens(mOrderedScreenIds), mUiExecutor);



            ItemInflater inflater = mCallbacks.getItemInflater();



            // Load items on the current page.

            if (enableWorkspaceInflation() && inflater != null) {

                inflateAsyncAndBind(currentWorkspaceItems, inflater, mUiExecutor);

                inflateAsyncAndBind(currentAppWidgets, inflater, mUiExecutor);

            } else {

                bindItemsInChunks(currentWorkspaceItems, ITEMS_CHUNK, mUiExecutor);

                bindItemsInChunks(currentAppWidgets, 1, mUiExecutor);

            }

            if (!FeatureFlags.CHANGE_MODEL_DELEGATE_LOADING_ORDER.get()) {

                mExtraItems.forEach(item ->

                        executeCallbacksTask(c -> c.bindExtraContainerItems(item), mUiExecutor));
@@ -323,7 +330,6 @@ public abstract class BaseLauncherBinder { 
            Executor pendingExecutor = pendingTasks::add;



            RunnableList onCompleteSignal = new RunnableList();

            ItemInflater inflater = mCallbacks.getItemInflater();



            if (enableWorkspaceInflation() && inflater != null) {

                MODEL_EXECUTOR.execute(() ->  {