Removing unnecessary preAdd method from ModelCallbacks

Bug: 390572144
Test: Presubmit
Flag: EXEMPT refactor
Change-Id: I23671339394e48ea1e8804a60be1d4dbf520e7d5
This commit is contained in:
Sunny Goyal committed 2025-03-26 11:57:17 -07:00
1 parent 66ac9dc459
commit 49ec691f92
5 files changed
+25 -33

No files matched your search

@@ -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<PendingInstallShortcutInfo> mStorage =
new PersistedItemArray<>(APPS_PENDING_INSTALL);
private final Context mContext;
private final Provider<WorkspaceItemSpaceFinder> mSpaceFinderProvider;
// Determines whether to defer installing shortcuts immediately until
// processAllPendingInstalls() is called.
@@ -101,8 +106,10 @@ public class ItemInstallQueue {
private List<PendingInstallShortcutInfo> mItems;
@Inject
public ItemInstallQueue(@ApplicationContext Context context) {
public ItemInstallQueue(@ApplicationContext Context context,
Provider<WorkspaceItemSpaceFinder> spaceFinderProvider) {
mContext = context;
mSpaceFinderProvider = spaceFinderProvider;
}
@WorkerThread
@@ -137,16 +144,30 @@ public class ItemInstallQueue {
List<Pair<ItemInfo, Object>> 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<Pair<ItemInfo, Object>> 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.
*/