From 49ec691f92ea689f9850d688ab0ff07f979e4f18 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Mon, 24 Mar 2025 13:04:16 -0700 Subject: [PATCH] Removing unnecessary preAdd method from ModelCallbacks Bug: 390572144 Test: Presubmit Flag: EXEMPT refactor Change-Id: I23671339394e48ea1e8804a60be1d4dbf520e7d5 --- src/com/android/launcher3/Launcher.java | 5 ---- src/com/android/launcher3/LauncherModel.kt | 11 ------- src/com/android/launcher3/ModelCallbacks.kt | 12 -------- .../android/launcher3/model/BgDataModel.java | 1 - .../launcher3/model/ItemInstallQueue.java | 29 ++++++++++++++++--- 5 files changed, 25 insertions(+), 33 deletions(-) diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index d5b3ed5645..69f11665a8 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2235,11 +2235,6 @@ public class Launcher extends StatefulActivity return screenIds.getArray(); } - @Override - public void preAddApps() { - mModelCallbacks.preAddApps(); - } - @Override public void bindAppsAdded(IntArray newScreens, ArrayList addNotAnimated, ArrayList addAnimated) { diff --git a/src/com/android/launcher3/LauncherModel.kt b/src/com/android/launcher3/LauncherModel.kt index 557ad67386..ef090233e3 100644 --- a/src/com/android/launcher3/LauncherModel.kt +++ b/src/com/android/launcher3/LauncherModel.kt @@ -20,13 +20,11 @@ import android.content.Intent import android.content.pm.ShortcutInfo import android.os.UserHandle import android.text.TextUtils -import android.util.Pair import androidx.annotation.WorkerThread import com.android.launcher3.celllayout.CellPosMapper import com.android.launcher3.dagger.ApplicationContext import com.android.launcher3.dagger.LauncherAppSingleton import com.android.launcher3.icons.IconCache -import com.android.launcher3.model.AddWorkspaceItemsTask import com.android.launcher3.model.AllAppsList import com.android.launcher3.model.BaseLauncherBinder.BaseLauncherBinderFactory import com.android.launcher3.model.BgDataModel @@ -45,8 +43,6 @@ import com.android.launcher3.model.ReloadStringCacheTask import com.android.launcher3.model.ShortcutsChangedTask import com.android.launcher3.model.UserLockStateChangedTask import com.android.launcher3.model.UserManagerState -import com.android.launcher3.model.WorkspaceItemSpaceFinder -import com.android.launcher3.model.data.ItemInfo import com.android.launcher3.model.data.WorkspaceItemInfo import com.android.launcher3.pm.UserCache import com.android.launcher3.shortcuts.ShortcutRequest @@ -85,7 +81,6 @@ constructor( private val mBgDataModel: BgDataModel, private val loaderFactory: LoaderTaskFactory, private val binderFactory: BaseLauncherBinderFactory, - private val spaceFinderFactory: Provider, val modelDbController: ModelDbController, ) { @@ -133,12 +128,6 @@ constructor( fun newModelCallbacks() = ModelLauncherCallbacks(this::enqueueModelUpdateTask) - /** Adds the provided items to the workspace. */ - fun addAndBindAddedWorkspaceItems(itemList: List?>) { - callbacks.forEach { it.preAddApps() } - enqueueModelUpdateTask(AddWorkspaceItemsTask(itemList, spaceFinderFactory.get())) - } - fun getWriter( verifyChanges: Boolean, cellPosMapper: CellPosMapper?, diff --git a/src/com/android/launcher3/ModelCallbacks.kt b/src/com/android/launcher3/ModelCallbacks.kt index f38dc418a0..4a2c909a1f 100644 --- a/src/com/android/launcher3/ModelCallbacks.kt +++ b/src/com/android/launcher3/ModelCallbacks.kt @@ -171,18 +171,6 @@ class ModelCallbacks(private var launcher: Launcher) : BgDataModel.Callbacks { ) } - override fun preAddApps() { - // If there's an undo snackbar, force it to complete to ensure empty screens are removed - // before trying to add new items. - launcher.modelWriter.commitDelete() - val snackbar = - AbstractFloatingView.getOpenView( - launcher, - AbstractFloatingView.TYPE_SNACKBAR, - ) - snackbar?.post { snackbar.close(true) } - } - @UiThread override fun bindAllApplications( apps: Array?, diff --git a/src/com/android/launcher3/model/BgDataModel.java b/src/com/android/launcher3/model/BgDataModel.java index ea9f36c419..3e5f7dc7e0 100644 --- a/src/com/android/launcher3/model/BgDataModel.java +++ b/src/com/android/launcher3/model/BgDataModel.java @@ -422,7 +422,6 @@ public class BgDataModel { default void bindScreens(IntArray orderedScreenIds) { } default void setIsFirstPagePinnedItemEnabled(boolean isFirstPagePinnedItemEnabled) { } default void finishBindingItems(IntSet pagesBoundFirst) { } - default void preAddApps() { } default void bindAppsAdded(IntArray newScreens, ArrayList addNotAnimated, ArrayList addAnimated) { } diff --git a/src/com/android/launcher3/model/ItemInstallQueue.java b/src/com/android/launcher3/model/ItemInstallQueue.java index 8acd7e22fc..7d07f6616d 100644 --- a/src/com/android/launcher3/model/ItemInstallQueue.java +++ b/src/com/android/launcher3/model/ItemInstallQueue.java @@ -24,6 +24,7 @@ import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPWIDG import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT; import static com.android.launcher3.model.data.AppInfo.makeLaunchIntent; import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_ARCHIVED; +import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.launcher3.util.Executors.MODEL_EXECUTOR; import android.appwidget.AppWidgetManager; @@ -39,8 +40,10 @@ import android.util.Log; import android.util.Pair; import androidx.annotation.Nullable; +import androidx.annotation.UiThread; import androidx.annotation.WorkerThread; +import com.android.launcher3.AbstractFloatingView; import com.android.launcher3.Flags; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.Launcher; @@ -66,6 +69,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import javax.inject.Inject; +import javax.inject.Provider; /** * Class to maintain a queue of pending items to be added to the workspace. @@ -92,6 +96,7 @@ public class ItemInstallQueue { private final PersistedItemArray mStorage = new PersistedItemArray<>(APPS_PENDING_INSTALL); private final Context mContext; + private final Provider mSpaceFinderProvider; // Determines whether to defer installing shortcuts immediately until // processAllPendingInstalls() is called. @@ -101,8 +106,10 @@ public class ItemInstallQueue { private List mItems; @Inject - public ItemInstallQueue(@ApplicationContext Context context) { + public ItemInstallQueue(@ApplicationContext Context context, + Provider spaceFinderProvider) { mContext = context; + mSpaceFinderProvider = spaceFinderProvider; } @WorkerThread @@ -137,16 +144,30 @@ public class ItemInstallQueue { List> installQueue = mItems.stream() .map(info -> info.getItemInfo(mContext)) .collect(Collectors.toList()); - // Add the items and clear queue if (!installQueue.isEmpty()) { - // add log - launcher.getModel().addAndBindAddedWorkspaceItems(installQueue); + MAIN_EXECUTOR.execute(() -> commitInstallQueue(launcher, installQueue)); } mItems.clear(); mStorage.getFile(mContext).delete(); } + @UiThread + private void commitInstallQueue(Launcher launcher, List> itemList) { + // If there's an undo snackbar, force it to complete to ensure empty screens are + // removed before trying to add new items. + launcher.getModelWriter().commitDelete(); + AbstractFloatingView snackbar = AbstractFloatingView.getOpenView( + launcher, + AbstractFloatingView.TYPE_SNACKBAR + ); + if (snackbar != null) { + snackbar.close(true); + } + launcher.getModel().enqueueModelUpdateTask( + new AddWorkspaceItemsTask(itemList, mSpaceFinderProvider.get())); + } + /** * Removes previously added items from the queue. */