diff --git a/quickstep/src/com/android/launcher3/model/PredictionHelper.kt b/quickstep/src/com/android/launcher3/model/PredictionHelper.kt index 91aea874c0..122cbd1d60 100644 --- a/quickstep/src/com/android/launcher3/model/PredictionHelper.kt +++ b/quickstep/src/com/android/launcher3/model/PredictionHelper.kt @@ -102,11 +102,9 @@ object PredictionHelper { ) putParcelableArrayList( BUNDLE_KEY_CURRENT_ITEMS, - dataModel.getPredictedContents(CONTAINER_HOTSEAT_PREDICTION).mapNotNullTo( - ArrayList() - ) { - getAppTargetFromItemInfo(context, it) - }, + dataModel.itemsIdMap + .getPredictedContents(CONTAINER_HOTSEAT_PREDICTION) + .mapNotNullTo(ArrayList()) { getAppTargetFromItemInfo(context, it) }, ) } } diff --git a/quickstep/src/com/android/launcher3/model/PredictionUpdateTask.java b/quickstep/src/com/android/launcher3/model/PredictionUpdateTask.java index 5dacd3ad3b..67a2b934eb 100644 --- a/quickstep/src/com/android/launcher3/model/PredictionUpdateTask.java +++ b/quickstep/src/com/android/launcher3/model/PredictionUpdateTask.java @@ -71,7 +71,7 @@ public class PredictionUpdateTask implements ModelUpdateTask { LauncherPrefs.get(context).put(LAST_PREDICTION_ENABLED, !mTargets.isEmpty()); Set usersForChangedShortcuts = - dataModel.getPredictedContents(mPredictorState.containerId).stream() + dataModel.itemsIdMap.getPredictedContents(mPredictorState.containerId).stream() .filter(info -> info.itemType == ITEM_TYPE_DEEP_SHORTCUT) .map(info -> info.user) .collect(Collectors.toSet()); @@ -120,7 +120,7 @@ public class PredictionUpdateTask implements ModelUpdateTask { } PredictedContainerInfo pci = new PredictedContainerInfo(mPredictorState.containerId, items); - dataModel.itemsIdMap.put(pci.id, pci); + dataModel.updateAndDispatchItem(pci /* item */, null /* owner */); taskController.bindUpdatedWorkspaceItems(Collections.singleton(pci)); usersForChangedShortcuts.forEach(u -> dataModel.updateShortcutPinnedState(context, u)); diff --git a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java index 84d4e50b95..e31d7548ea 100644 --- a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java +++ b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java @@ -37,7 +37,6 @@ import android.text.TextUtils; import android.util.Log; import android.util.StatsEvent; -import androidx.annotation.CallSuper; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; @@ -53,6 +52,7 @@ import com.android.launcher3.logging.InstanceIdSequence; import com.android.launcher3.model.data.CollectionInfo; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.PredictedContainerInfo; +import com.android.launcher3.model.data.WorkspaceData; import com.android.launcher3.pm.UserCache; import com.android.launcher3.util.IntSparseArrayMap; import com.android.quickstep.logging.SettingsChangeLogger; @@ -119,34 +119,26 @@ public class QuickstepModelDelegate extends ModelDelegate { ? null : context.getSystemService(StatsManager.class); } - @CallSuper @Override - public void loadAndBindWorkspaceItems() { - loadAndBindPredictedItems(mIDP.numDatabaseHotseatIcons, mHotseatPredictionState); - } + public void loadAndAddExtraModelItems(@NonNull IntSparseArrayMap outLoadedItems) { + loadAndBindPredictedItems( + mIDP.numDatabaseHotseatIcons, mHotseatPredictionState, outLoadedItems); + loadAndBindPredictedItems(mIDP.numDatabaseAllAppsColumns, mAllPredictionAppsState, + outLoadedItems); - @CallSuper - @Override - public void loadAndBindAllAppsItems() { - loadAndBindPredictedItems(mIDP.numDatabaseAllAppsColumns, mAllPredictionAppsState); + // Widgets prediction isn't used frequently. And thus, it is not persisted on disk. + PredictedContainerInfo widgetPredictionFCI = new PredictedContainerInfo( + mWidgetsRecommendationState.containerId, new ArrayList<>()); + outLoadedItems.put(mWidgetsRecommendationState.containerId, widgetPredictionFCI); } @WorkerThread - private void loadAndBindPredictedItems( - int numColumns, @NonNull PredictorState state) { + private void loadAndBindPredictedItems(int numColumns, + @NonNull PredictorState state, @NonNull IntSparseArrayMap outLoadedItems) { PredictedItemFactory parser = mItemParserFactory.newParser(numColumns, state); PredictedContainerInfo fci = new PredictedContainerInfo(state.containerId, state.storage.read(mContext, parser, mUserCache::getUserForSerialNumber)); - mDataModel.itemsIdMap.put(state.containerId, fci); - } - - @CallSuper - @Override - public void loadAndBindOtherItems() { - PredictedContainerInfo widgetPredictionFCI = new PredictedContainerInfo( - mWidgetsRecommendationState.containerId, new ArrayList<>()); - // Widgets prediction isn't used frequently. And thus, it is not persisted on disk. - mDataModel.itemsIdMap.put(mWidgetsRecommendationState.containerId, widgetPredictionFCI); + outLoadedItems.put(state.containerId, fci); } public void markActive() { @@ -181,9 +173,9 @@ public class QuickstepModelDelegate extends ModelDelegate { elapsedTime)); } } else { - IntSparseArrayMap itemsIdMap; + WorkspaceData itemsIdMap; synchronized (mDataModel) { - itemsIdMap = mDataModel.itemsIdMap.clone(); + itemsIdMap = mDataModel.itemsIdMap.copy(); } InstanceId instanceId = new InstanceIdSequence().newInstanceId(); for (ItemInfo info : itemsIdMap) { @@ -214,9 +206,9 @@ public class QuickstepModelDelegate extends ModelDelegate { MODEL_EXECUTOR, (i, eventList) -> { InstanceId instanceId = new InstanceIdSequence().newInstanceId(); - IntSparseArrayMap itemsIdMap; + WorkspaceData itemsIdMap; synchronized (mDataModel) { - itemsIdMap = mDataModel.itemsIdMap.clone(); + itemsIdMap = mDataModel.itemsIdMap.copy(); } for (ItemInfo info : itemsIdMap) { @@ -230,7 +222,7 @@ public class QuickstepModelDelegate extends ModelDelegate { Log.d(TAG, String.format( "Successfully logged %d workspace items with instanceId=%d", - itemsIdMap.size(), instanceId.getId())); + eventList.size(), instanceId.getId())); additionalSnapshotEvents(instanceId); SettingsChangeLogger.INSTANCE.get(mContext).logSnapshot(instanceId); return StatsManager.PULL_SUCCESS; @@ -244,7 +236,7 @@ public class QuickstepModelDelegate extends ModelDelegate { } private static CollectionInfo getContainer( - ItemInfo info, IntSparseArrayMap itemsIdMap) { + ItemInfo info, WorkspaceData itemsIdMap) { if (info.container > 0) { ItemInfo containerInfo = itemsIdMap.get(info.container); diff --git a/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java b/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java index d4de22574c..e234a1cb60 100644 --- a/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java +++ b/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java @@ -136,7 +136,7 @@ public final class WidgetsPredictionUpdateTask implements ModelUpdateTask { PredictedContainerInfo pci = new PredictedContainerInfo(mPredictorState.containerId, items); - dataModel.itemsIdMap.put(mPredictorState.containerId, pci); + dataModel.updateAndDispatchItem(pci /* item */, null /* owner */); taskController.bindUpdatedWorkspaceItems(Collections.singleton(pci)); // Don't store widgets prediction to disk because it is not used frequently. diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacks.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacks.java index 134e7f844a..15807ae547 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacks.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacks.java @@ -32,9 +32,9 @@ import com.android.launcher3.model.BgDataModel; import com.android.launcher3.model.data.AppInfo; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.PredictedContainerInfo; +import com.android.launcher3.model.data.WorkspaceData; import com.android.launcher3.taskbar.TaskbarView.TaskbarLayoutParams; import com.android.launcher3.util.ComponentKey; -import com.android.launcher3.util.IntSparseArrayMap; import com.android.launcher3.util.ItemInfoMatcher; import com.android.launcher3.util.LauncherBindableItemsContainer; import com.android.launcher3.util.PackageUserKey; @@ -79,10 +79,9 @@ public class TaskbarModelCallbacks implements } @Override - public void bindCompleteModel(IntSparseArrayMap itemIdMap, boolean isBindingSync) { + public void bindCompleteModel(WorkspaceData itemIdMap, boolean isBindingSync) { mHotseatItems.clear(); - mPredictedItems = itemIdMap.get(CONTAINER_HOTSEAT_PREDICTION) - instanceof PredictedContainerInfo pci ? pci.getContents() : Collections.emptyList(); + mPredictedItems = itemIdMap.getPredictedContents(CONTAINER_HOTSEAT_PREDICTION); handleItemsAdded(itemIdMap); if (itemIdMap.get(CONTAINER_ALL_APPS_PREDICTION) instanceof PredictedContainerInfo pci) { diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/model/PredictionHelperTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/model/PredictionHelperTest.kt index 09a9925c57..c12d25f779 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/model/PredictionHelperTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/model/PredictionHelperTest.kt @@ -34,6 +34,7 @@ import com.android.launcher3.model.PredictionHelper.isTrackedForHotseatPredictio import com.android.launcher3.model.PredictionHelper.isTrackedForWidgetPrediction import com.android.launcher3.model.data.AppInfo import com.android.launcher3.model.data.LauncherAppWidgetInfo +import com.android.launcher3.util.ModelTestExtensions.initItems import com.android.launcher3.util.SandboxApplication import com.google.common.truth.Truth.assertThat import org.junit.Assert.assertFalse @@ -48,6 +49,7 @@ import org.mockito.kotlin.mock class PredictionHelperTest { @get:Rule val context = SandboxApplication() + private var itemIdCounter: Int = 0 @Test fun isTrackedForHotseatPrediction_true_for_valid_items() { @@ -104,9 +106,11 @@ class PredictionHelperTest { @Test fun getBundleForHotseatPredictions_contains_pin_events() { val dataModel = BgDataModel(mock(), mock(), mock(), mock()) - dataModel.itemsIdMap[0] = createAppInfo("test1") - dataModel.itemsIdMap[1] = createAppInfo("test2", CONTAINER_HOTSEAT, 2) - dataModel.itemsIdMap[2] = createAppInfo("test3", 2 /* folder */) + dataModel.initItems( + createAppInfo("test1"), + createAppInfo("test2", CONTAINER_HOTSEAT, 2), + createAppInfo("test3", 2 /* folder */), + ) val items = getBundleForHotseatPredictions(context, dataModel) @@ -122,9 +126,11 @@ class PredictionHelperTest { @Test fun getBundleForWidgetPredictions_contains_pin_events() { val dataModel = BgDataModel(mock(), mock(), mock(), mock()) - dataModel.itemsIdMap[0] = createAppInfo("test1") - dataModel.itemsIdMap[1] = createAppInfo("test2", CONTAINER_HOTSEAT, 2) - dataModel.itemsIdMap[2] = createWidgetInfoInfo("test3") + dataModel.initItems( + createAppInfo("test1"), + createAppInfo("test2", CONTAINER_HOTSEAT, 2), + createWidgetInfoInfo("test3"), + ) val items = getBundleForWidgetPredictions(context, dataModel) @@ -140,12 +146,15 @@ class PredictionHelperTest { screenId: Int = FIRST_SCREEN_ID, ) = AppInfo().apply { + this.id = itemIdCounter this.container = container this.screenId = screenId this.intent = Intent().setComponent(ComponentName(pkg, pkg)) this.componentName = ComponentName(pkg, pkg) this.cellX = 0 this.cellY = 0 + + itemIdCounter++ } private fun createWidgetInfoInfo( @@ -154,10 +163,13 @@ class PredictionHelperTest { screenId: Int = FIRST_SCREEN_ID, ) = LauncherAppWidgetInfo().apply { + this.id = itemIdCounter this.container = container this.screenId = screenId this.providerName = ComponentName(pkg, pkg) this.cellX = 0 this.cellY = 0 + + itemIdCounter++ } } diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/model/PredictionUpdateTaskTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/model/PredictionUpdateTaskTest.kt index fac9343537..a17ab9033a 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/model/PredictionUpdateTaskTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/model/PredictionUpdateTaskTest.kt @@ -68,7 +68,7 @@ class PredictionUpdateTaskTest { ) } assertThat(component.getDataModel().itemsIdMap[containerId]).isNotNull() - assertThat(component.getDataModel().getPredictedContents(containerId)).isEmpty() + assertThat(component.getDataModel().itemsIdMap.getPredictedContents(containerId)).isEmpty() } @Test @@ -87,7 +87,7 @@ class PredictionUpdateTaskTest { ) } assertThat(component.getDataModel().itemsIdMap[containerId]).isNotNull() - val items = component.getDataModel().getPredictedContents(containerId) + val items = component.getDataModel().itemsIdMap.getPredictedContents(containerId) assertThat(items).hasSize(2) } diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarOverflowTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarOverflowTest.kt index 9ae7edee15..35490abca5 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarOverflowTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarOverflowTest.kt @@ -33,6 +33,7 @@ import com.android.launcher3.dagger.LauncherComponentProvider.appComponent import com.android.launcher3.model.BgDataModel import com.android.launcher3.model.data.ItemInfo import com.android.launcher3.model.data.TaskItemInfo +import com.android.launcher3.model.data.WorkspaceData import com.android.launcher3.model.data.WorkspaceItemInfo import com.android.launcher3.popup.SystemShortcut import com.android.launcher3.statehandlers.DesktopVisibilityController @@ -55,7 +56,6 @@ import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.InjectController import com.android.launcher3.taskbar.rules.TaskbarWindowSandboxContext import com.android.launcher3.util.AllModulesForTest import com.android.launcher3.util.FakePrefsModule -import com.android.launcher3.util.IntSparseArrayMap import com.android.launcher3.util.LauncherMultivalentJUnit import com.android.launcher3.util.LauncherMultivalentJUnit.EmulatedDevices import com.android.launcher3.util.Preconditions.assertNotNull @@ -695,10 +695,8 @@ class TaskbarOverflowTest { var hotseatItems = mutableListOf() var recentAppsController: TaskbarRecentAppsController? = null - override fun bindCompleteModel( - itemIdMap: IntSparseArrayMap, - isBindingSync: Boolean, - ) = bindItemsAdded(itemIdMap.toList()) + override fun bindCompleteModel(itemIdMap: WorkspaceData, isBindingSync: Boolean) = + bindItemsAdded(itemIdMap.toList()) override fun bindItemsAdded(items: List) { runOnMainSync { diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index d20a683b66..60c49eb305 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -210,6 +210,7 @@ import com.android.launcher3.model.data.FolderInfo; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.LauncherAppWidgetInfo; import com.android.launcher3.model.data.PredictedContainerInfo; +import com.android.launcher3.model.data.WorkspaceData; import com.android.launcher3.model.data.WorkspaceItemInfo; import com.android.launcher3.notification.NotificationListener; import com.android.launcher3.pm.PinRequestHelper; @@ -231,7 +232,6 @@ import com.android.launcher3.util.CannedAnimationCoordinator; import com.android.launcher3.util.ComponentKey; import com.android.launcher3.util.ContextTracker; import com.android.launcher3.util.IntSet; -import com.android.launcher3.util.IntSparseArrayMap; import com.android.launcher3.util.ItemInflater; import com.android.launcher3.util.KeyboardShortcutsDelegate; import com.android.launcher3.util.LauncherBindableItemsContainer; @@ -2198,8 +2198,7 @@ public class Launcher extends StatefulActivity } @Override - public void bindCompleteModelAsync( - IntSparseArrayMap itemIdMap, boolean isBindingSync) { + public void bindCompleteModelAsync(WorkspaceData itemIdMap, boolean isBindingSync) { mModelCallbacks.bindCompleteModelAsync(itemIdMap, isBindingSync); } diff --git a/src/com/android/launcher3/ModelCallbacks.kt b/src/com/android/launcher3/ModelCallbacks.kt index a84d8ad205..9245891078 100644 --- a/src/com/android/launcher3/ModelCallbacks.kt +++ b/src/com/android/launcher3/ModelCallbacks.kt @@ -8,7 +8,6 @@ import android.util.Pair import androidx.annotation.AnyThread import androidx.annotation.UiThread import androidx.annotation.VisibleForTesting -import com.android.launcher3.BuildConfig.QSB_ON_FIRST_SCREEN import com.android.launcher3.LauncherConstants.TraceEvents import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_DESKTOP import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT @@ -24,6 +23,7 @@ import com.android.launcher3.model.StringCache import com.android.launcher3.model.data.AppInfo import com.android.launcher3.model.data.ItemInfo import com.android.launcher3.model.data.PredictedContainerInfo +import com.android.launcher3.model.data.WorkspaceData import com.android.launcher3.popup.PopupContainerWithArrow import com.android.launcher3.util.ComponentKey import com.android.launcher3.util.Executors @@ -32,7 +32,6 @@ import com.android.launcher3.util.IntArray as LIntArray import com.android.launcher3.util.IntArray import com.android.launcher3.util.IntSet as LIntSet import com.android.launcher3.util.IntSet -import com.android.launcher3.util.IntSparseArrayMap import com.android.launcher3.util.ItemInfoMatcher import com.android.launcher3.util.PackageUserKey import com.android.launcher3.util.Preconditions @@ -401,10 +400,7 @@ class ModelCallbacks(private var launcher: Launcher) : BgDataModel.Callbacks { } @AnyThread - override fun bindCompleteModelAsync( - itemIdMap: IntSparseArrayMap, - isBindingSync: Boolean, - ) { + override fun bindCompleteModelAsync(itemIdMap: WorkspaceData, isBindingSync: Boolean) { val taskTracker = CancellationSignal() activeBindTask.getAndSet(taskTracker).cancel() @@ -447,13 +443,7 @@ class ModelCallbacks(private var launcher: Launcher) : BgDataModel.Callbacks { MAIN_EXECUTOR.execute { clearPendingBinds() } - val orderedScreenIds = - IntSet() - .apply { - itemIdMap.forEach { if (it.container == CONTAINER_DESKTOP) add(it.screenId) } - if (QSB_ON_FIRST_SCREEN || isEmpty) add(Workspace.FIRST_SCREEN_ID) - } - .array + val orderedScreenIds = itemIdMap.collectWorkspaceScreens() val currentScreenIds = getPagesToBindSynchronously(orderedScreenIds) fun setupPendingBind(pendingExecutor: Executor) { @@ -530,7 +520,12 @@ class ModelCallbacks(private var launcher: Launcher) : BgDataModel.Callbacks { onCompleteSignal.executeAllAndDestroy() } - val workspaceItemCount = itemIdMap.size() + // Only include the first level items on desktop (excluding folder contents) for item count + val workspaceItemCount = + currentWorkspaceItems.size + + otherWorkspaceItems.size + + currentAppWidgets.size + + otherAppWidgets.size executeCallbacksTask { onInitialBindComplete( currentScreenIds, diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java index 955e799559..cf98a92bbe 100644 --- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java +++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java @@ -478,7 +478,8 @@ public class LauncherPreviewRenderer extends BaseContext } private void populateHotseatPredictions(BgDataModel dataModel) { - List predictions = dataModel.getPredictedContents(CONTAINER_HOTSEAT_PREDICTION); + List predictions = dataModel.itemsIdMap + .getPredictedContents(CONTAINER_HOTSEAT_PREDICTION); int predictionIndex = 0; for (int rank = 0; rank < mDp.numShownHotseatIcons; rank++) { if (predictions.size() <= predictionIndex) continue; diff --git a/src/com/android/launcher3/model/AddWorkspaceItemsTask.java b/src/com/android/launcher3/model/AddWorkspaceItemsTask.java index abcc0cb031..e2fbffc8ef 100644 --- a/src/com/android/launcher3/model/AddWorkspaceItemsTask.java +++ b/src/com/android/launcher3/model/AddWorkspaceItemsTask.java @@ -85,7 +85,7 @@ public class AddWorkspaceItemsTask implements ModelUpdateTask { final Context context = taskController.getContext(); synchronized (dataModel) { - IntArray workspaceScreens = dataModel.collectWorkspaceScreens(); + IntArray workspaceScreens = dataModel.itemsIdMap.collectWorkspaceScreens(); List filteredItems = new ArrayList<>(); for (Pair entry : mItemList) { diff --git a/src/com/android/launcher3/model/BaseLauncherBinder.java b/src/com/android/launcher3/model/BaseLauncherBinder.java index 70819a4fc2..38d5195174 100644 --- a/src/com/android/launcher3/model/BaseLauncherBinder.java +++ b/src/com/android/launcher3/model/BaseLauncherBinder.java @@ -29,9 +29,8 @@ import com.android.launcher3.dagger.ApplicationContext; import com.android.launcher3.model.BgDataModel.Callbacks; import com.android.launcher3.model.BgDataModel.FixedContainerItems; import com.android.launcher3.model.data.AppInfo; -import com.android.launcher3.model.data.ItemInfo; +import com.android.launcher3.model.data.WorkspaceData; import com.android.launcher3.util.ComponentKey; -import com.android.launcher3.util.IntSparseArrayMap; import com.android.launcher3.util.LooperExecutor; import com.android.launcher3.util.LooperIdleLock; import com.android.launcher3.util.PackageUserKey; @@ -90,12 +89,12 @@ public class BaseLauncherBinder { Trace.beginSection("BaseLauncherBinder#bindWorkspace"); try { // Save a copy of all the bg-thread collections - IntSparseArrayMap itemsIdMap; + WorkspaceData itemsIdMap; ArrayList extraItems = new ArrayList<>(); StringCache stringCache; synchronized (mBgDataModel) { - itemsIdMap = mBgDataModel.itemsIdMap.clone(); + itemsIdMap = mBgDataModel.itemsIdMap.copy(); mBgDataModel.extraItems.forEach(extraItems::add); if (incrementBindId) { mBgDataModel.lastBindId++; diff --git a/src/com/android/launcher3/model/BgDataModel.kt b/src/com/android/launcher3/model/BgDataModel.kt index 60cc04898a..c3c6c34782 100644 --- a/src/com/android/launcher3/model/BgDataModel.kt +++ b/src/com/android/launcher3/model/BgDataModel.kt @@ -21,6 +21,7 @@ import android.content.pm.LauncherApps.ShortcutQuery import android.content.pm.ShortcutInfo import android.os.UserHandle import android.util.Log +import android.util.SparseArray import androidx.annotation.AnyThread import com.android.launcher3.BuildConfig import com.android.launcher3.Flags @@ -29,7 +30,6 @@ import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT import com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APP_PAIR import com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT import com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_FOLDER -import com.android.launcher3.Workspace import com.android.launcher3.dagger.LauncherAppSingleton import com.android.launcher3.logging.DumpManager import com.android.launcher3.logging.DumpManager.LauncherDumpable @@ -39,19 +39,16 @@ import com.android.launcher3.model.data.CollectionInfo import com.android.launcher3.model.data.ItemInfo import com.android.launcher3.model.data.LauncherAppWidgetInfo import com.android.launcher3.model.data.PredictedContainerInfo +import com.android.launcher3.model.data.WorkspaceData +import com.android.launcher3.model.data.WorkspaceData.MutableWorkspaceData import com.android.launcher3.model.data.WorkspaceItemInfo import com.android.launcher3.model.repository.HomeScreenRepository -import com.android.launcher3.model.repository.HomeScreenRepository.WorkspaceData.ChangeEvent.AddEvent -import com.android.launcher3.model.repository.HomeScreenRepository.WorkspaceData.ChangeEvent.RemoveEvent -import com.android.launcher3.model.repository.HomeScreenRepository.WorkspaceData.ChangeEvent.UpdateEvent import com.android.launcher3.pm.UserCache import com.android.launcher3.shortcuts.ShortcutKey import com.android.launcher3.shortcuts.ShortcutRequest import com.android.launcher3.util.ComponentKey import com.android.launcher3.util.DaggerSingletonTracker import com.android.launcher3.util.Executors -import com.android.launcher3.util.IntArray -import com.android.launcher3.util.IntSet import com.android.launcher3.util.IntSparseArrayMap import com.android.launcher3.util.PackageUserKey import com.android.launcher3.widget.model.WidgetsListBaseEntry @@ -77,11 +74,14 @@ constructor( dumpManager: DumpManager, lifeCycle: DaggerSingletonTracker, ) : LauncherDumpable { + + private val mutableWorkspaceData = MutableWorkspaceData() + /** * Map of all the ItemInfos (shortcuts, folders, widgets and predicted items) created by * LauncherModel to their ids */ - @JvmField val itemsIdMap = IntSparseArrayMap() + @JvmField val itemsIdMap: WorkspaceData = mutableWorkspaceData /** Extra container based items */ @Deprecated("Use independent repository for each extra item") @@ -106,34 +106,13 @@ constructor( lifeCycle.addCloseable(dumpManager.register(this)) } - /** - * Returns the predicted items for the provided [containerId] or an empty list id no such - * container exists - */ - fun getPredictedContents(containerId: Int): List = - itemsIdMap[containerId].let { if (it is PredictedContainerInfo) it.getContents() else null } - ?: Collections.emptyList() - /** Clears all the data */ @Synchronized fun clear() { - itemsIdMap.clear() deepShortcutMap.clear() extraItems.clear() } - /** Creates an array of valid workspace screens based on current items in the model. */ - @Synchronized - fun collectWorkspaceScreens(): IntArray { - val screenSet = IntSet() - itemsIdMap.forEach { if (it.container == CONTAINER_DESKTOP) screenSet.add(it.screenId) } - - if (BuildConfig.QSB_ON_FIRST_SCREEN || screenSet.isEmpty) { - screenSet.add(Workspace.FIRST_SCREEN_ID) - } - return screenSet.array - } - @Synchronized override fun dump(prefix: String, writer: PrintWriter, args: Array?) { writer.println(prefix + "Data Model:") @@ -172,32 +151,33 @@ constructor( } } - items.forEach { itemsIdMap.remove(it.id) } + mutableWorkspaceData.removeItems(items, owner) items .asSequence() .map { it.user } .distinct() .forEach { updateShortcutPinnedState(context, it) } + updateHomeRepository() + } + + private fun updateHomeRepository() { if (Flags.modelRepository() && repo != null) { - repo.dispatchChange(this, RemoveEvent(items.toList(), owner)) + repo.dispatchChange(mutableWorkspaceData.copy()) } } @Synchronized @JvmOverloads - fun addItem(context: Context, item: ItemInfo, newItem: Boolean, owner: Any? = null) { - itemsIdMap.put(item.id, item) - if (newItem && item.itemType == ITEM_TYPE_DEEP_SHORTCUT) { + fun addItem(context: Context, item: ItemInfo, owner: Any? = null) { + mutableWorkspaceData.addItem(item, owner) + if (item.itemType == ITEM_TYPE_DEEP_SHORTCUT) { updateShortcutPinnedState(context, item.user) } - if (newItem && Flags.modelRepository() && repo != null) { - repo.dispatchChange(this, AddEvent(listOf(item), owner)) - } + updateHomeRepository() if ( BuildConfig.IS_DEBUG_DEVICE && - newItem && item.container != CONTAINER_DESKTOP && item.container != CONTAINER_HOTSEAT && (itemsIdMap[item.container] !is CollectionInfo) @@ -208,15 +188,21 @@ constructor( } @Synchronized - fun updateItems(items: List, owner: Any?) { - if (Flags.modelRepository() && repo != null) { - repo.dispatchChange(this, UpdateEvent(items, owner)) - } + fun updateAndDispatchItem(item: ItemInfo, owner: Any?) { + mutableWorkspaceData.replaceItem(item, owner) + updateHomeRepository() } @Synchronized - fun dataLoadComplete() { - if (Flags.modelRepository() && repo != null) repo.onNewBind(this) + fun updateItems(items: List, owner: Any?) { + mutableWorkspaceData.notifyItemsUpdated(items, owner) + updateHomeRepository() + } + + @Synchronized + fun dataLoadComplete(allItems: SparseArray) { + mutableWorkspaceData.replaceDataMap(allItems) + updateHomeRepository() } /** @@ -406,11 +392,11 @@ constructor( * the client to move the executor to appropriate thread */ @AnyThread - fun bindCompleteModelAsync(itemIdMap: IntSparseArrayMap, isBindingSync: Boolean) { + fun bindCompleteModelAsync(itemIdMap: WorkspaceData, isBindingSync: Boolean) { Executors.MAIN_EXECUTOR.execute { bindCompleteModel(itemIdMap, isBindingSync) } } - fun bindCompleteModel(itemIdMap: IntSparseArrayMap, isBindingSync: Boolean) {} + fun bindCompleteModel(itemIdMap: WorkspaceData, isBindingSync: Boolean) {} fun bindItemsAdded(items: List<@JvmSuppressWildcards ItemInfo>) {} diff --git a/src/com/android/launcher3/model/LoaderCursor.java b/src/com/android/launcher3/model/LoaderCursor.java index 392383839a..7411afb45e 100644 --- a/src/com/android/launcher3/model/LoaderCursor.java +++ b/src/com/android/launcher3/model/LoaderCursor.java @@ -530,9 +530,9 @@ public class LoaderCursor extends CursorWrapper { * Return an existing FolderInfo object if we have encountered this ID previously, * or make a new one. */ - public CollectionInfo findOrMakeFolder(int id, BgDataModel dataModel) { + public CollectionInfo findOrMakeFolder(int id, IntSparseArrayMap loadedItems) { // See if a placeholder was created for us already - ItemInfo info = dataModel.itemsIdMap.get(id); + ItemInfo info = loadedItems.get(id); if (info instanceof CollectionInfo c) return c; CollectionInfo pending = mPendingCollectionInfo.get(id); @@ -553,7 +553,7 @@ public class LoaderCursor extends CursorWrapper { * otherwise marks it for deletion. */ public void checkAndAddItem( - ItemInfo info, BgDataModel dataModel, LoaderMemoryLogger logger) { + ItemInfo info, IntSparseArrayMap loadedItems, LoaderMemoryLogger logger) { if (info.itemType == Favorites.ITEM_TYPE_DEEP_SHORTCUT) { // Ensure that it is a valid intent. An exception here will // cause the item loading to get skipped @@ -567,13 +567,13 @@ public class LoaderCursor extends CursorWrapper { String.format("Adding item to ID map: %s", info), /* stackTrace= */ null); } - dataModel.addItem(mContext, info, false); + loadedItems.put(info.id, info); if ((info.itemType == ITEM_TYPE_APP_PAIR || info.itemType == ITEM_TYPE_DEEP_SHORTCUT || info.itemType == ITEM_TYPE_APPLICATION) && info.container != CONTAINER_DESKTOP && info.container != CONTAINER_HOTSEAT) { - findOrMakeFolder(info.container, dataModel).add(info); + findOrMakeFolder(info.container, loadedItems).add(info); } if (mRestoreEventLogger != null) { mRestoreEventLogger.logSingleFavoritesItemRestored(itemType); diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java index 3ed72d8789..614449c230 100644 --- a/src/com/android/launcher3/model/LoaderTask.java +++ b/src/com/android/launcher3/model/LoaderTask.java @@ -18,7 +18,6 @@ package com.android.launcher3.model; import static com.android.launcher3.Flags.enableLauncherBrMetricsFixed; import static com.android.launcher3.LauncherPrefs.IS_FIRST_LOAD_AFTER_RESTORE; -import static com.android.launcher3.LauncherSettings.Favorites.DESKTOP_ICON_FLAG; import static com.android.launcher3.icons.CacheableShortcutInfo.convertShortcutsToCacheableShortcuts; import static com.android.launcher3.icons.cache.CacheLookupFlag.DEFAULT_LOOKUP_FLAG; import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_HAS_SHORTCUT_PERMISSION; @@ -60,13 +59,10 @@ import com.android.launcher3.Flags; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.LauncherModel; import com.android.launcher3.LauncherPrefs; -import com.android.launcher3.LauncherSettings.Favorites; import com.android.launcher3.Utilities; import com.android.launcher3.backuprestore.LauncherRestoreEventLogger; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.dagger.ApplicationContext; -import com.android.launcher3.folder.Folder; -import com.android.launcher3.folder.FolderGridOrganizer; import com.android.launcher3.folder.FolderNameInfos; import com.android.launcher3.folder.FolderNameProvider; import com.android.launcher3.icons.CacheableShortcutCachingLogic; @@ -79,7 +75,6 @@ import com.android.launcher3.icons.cache.LauncherActivityCachingLogic; import com.android.launcher3.logging.FileLog; import com.android.launcher3.model.LoaderCursor.LoaderCursorFactory; import com.android.launcher3.model.data.AppInfo; -import com.android.launcher3.model.data.AppPairInfo; import com.android.launcher3.model.data.FolderInfo; import com.android.launcher3.model.data.IconRequestInfo; import com.android.launcher3.model.data.ItemInfo; @@ -165,7 +160,6 @@ public class LoaderTask implements Runnable { private boolean mStopped; private final Set mPendingPackages = new HashSet<>(); - private boolean mItemsDeleted = false; private String mDbName; private final Provider mFolderNameProviderFactory; private final Provider mRestoreEventLoggerProvider; @@ -226,7 +220,7 @@ public class LoaderTask implements Runnable { private void sendFirstScreenActiveInstallsBroadcast() { // Screen set is never empty - IntArray allScreens = mBgDataModel.collectWorkspaceScreens(); + IntArray allScreens = mBgDataModel.itemsIdMap.collectWorkspaceScreens(); final int firstScreen = allScreens.get(0); IntSet firstScreens = IntSet.wrap(firstScreen); @@ -287,8 +281,6 @@ public class LoaderTask implements Runnable { // after a simulated restore. if (Objects.equals(mIDP.dbFile, mDbName)) { verifyNotStopped(); - sanitizeFolders(mItemsDeleted); - sanitizeAppPairs(); sanitizeWidgetsShortcutsAndPackages(); logASplit("sanitizeData finished"); } @@ -469,17 +461,17 @@ public class LoaderTask implements Runnable { mIsRestoreFromBackup ? restoreEventLogger : null); final Bundle extras = c.getExtras(); mDbName = extras == null ? null : extras.getString(ModelDbController.EXTRA_DB_NAME); + WorkspaceItemProcessor itemProcessor; try { final LongSparseArray unlockedUsers = new LongSparseArray<>(); queryPinnedShortcutsForUnlockedUsers(mContext, unlockedUsers); mWorkspaceIconRequestInfos = new ArrayList<>(); - WorkspaceItemProcessor itemProcessor = new WorkspaceItemProcessor(c, memoryLogger, + itemProcessor = new WorkspaceItemProcessor(c, memoryLogger, mUserCache, mUserManagerState, mLauncherApps, mPendingPackages, mShortcutKeyToPinnedShortcuts, mContext, mIDP, mIconCache, - mIsSafeModeEnabled, mBgDataModel, - installingPkgs, isSdCardReady, widgetInflater, mPmHelper, - mWorkspaceIconRequestInfos, unlockedUsers, allDeepShortcuts); + mIsSafeModeEnabled, installingPkgs, isSdCardReady, widgetInflater, + mPmHelper, mWorkspaceIconRequestInfos, unlockedUsers, allDeepShortcuts); if (mStopped) { Log.w(TAG, "loadWorkspaceImpl: Loader stopped, skipping item processing"); @@ -493,44 +485,18 @@ public class LoaderTask implements Runnable { IOUtils.closeSilently(c); } - mModelDelegate.loadAndBindWorkspaceItems(); - mModelDelegate.loadAndBindAllAppsItems(); - mModelDelegate.loadAndBindOtherItems(); - mBgDataModel.stringCache.loadStrings(mContext); - mModelDelegate.markActive(); - // Break early if we've stopped loading if (mStopped) { mBgDataModel.clear(); return; } - // Remove dead items - mItemsDeleted = c.commitDeleted(); - - processFolderItems(); - processAppPairItems(); - - c.commitRestoredItems(); - - mBgDataModel.dataLoadComplete(); + mBgDataModel.stringCache.loadStrings(mContext); + mBgDataModel.dataLoadComplete( + itemProcessor.finalizeData(mModelDelegate, mModel.getModelDbController())); } } - /** - * After all items have been processed and added to the BgDataModel, this method sorts and - * requests high-res icons for the items that are part of an app pair. - */ - private void processAppPairItems() { - mBgDataModel.itemsIdMap.stream() - .filter(item -> item instanceof AppPairInfo) - .forEach(item -> { - AppPairInfo appPair = (AppPairInfo) item; - appPair.getContents().sort(Folder.ITEM_POS_COMPARATOR); - appPair.fetchHiResIconsIfNeeded(mIconCache); - }); - } - /** * Initialized the UserManagerState, and determines which users are unlocked. Additionally, if * the user is unlocked, it queries LauncherAppsService for pinned shortcuts and stores the @@ -574,44 +540,6 @@ public class LoaderTask implements Runnable { } - /** - * After all items have been processed and added to the BgDataModel, this method can correctly - * rank items inside folders and load the correct miniature preview icons to be shown when the - * folder is collapsed. - */ - @WorkerThread - private void processFolderItems() { - // Sort the folder items, update ranks, and make sure all preview items are high res. - List verifiers = mIDP.supportedProfiles - .stream().map(FolderGridOrganizer::createFolderGridOrganizer).toList(); - for (ItemInfo itemInfo : mBgDataModel.itemsIdMap) { - if (!(itemInfo instanceof FolderInfo folder)) { - continue; - } - - folder.getContents().sort(Folder.ITEM_POS_COMPARATOR); - verifiers.forEach(verifier -> verifier.setFolderInfo(folder)); - int size = folder.getContents().size(); - - // Update ranks here to ensure there are no gaps caused by removed folder items. - // Ranks are the source of truth for folder items, so cellX and cellY can be - // ignored for now. Database will be updated once user manually modifies folder. - for (int rank = 0; rank < size; ++rank) { - ItemInfo info = folder.getContents().get(rank); - info.rank = rank; - - if (info instanceof WorkspaceItemInfo wii - && wii.getMatchingLookupFlag().isVisuallyLessThan(DESKTOP_ICON_FLAG) - && wii.itemType == Favorites.ITEM_TYPE_APPLICATION - && verifiers.stream().anyMatch(it -> it.isItemInPreview(info.rank))) { - mIconCache.getTitleAndIcon(wii, DESKTOP_ICON_FLAG); - } else if (info instanceof AppPairInfo api) { - api.fetchHiResIconsIfNeeded(mIconCache); - } - } - } - } - private void tryLoadWorkspaceIconsInBulk( List> iconRequestInfos) { Trace.beginSection("LoadWorkspaceIconsInBulk"); @@ -634,14 +562,12 @@ public class LoaderTask implements Runnable { // Ignore packages which have a promise icon. synchronized (mBgDataModel) { for (ItemInfo info : mBgDataModel.itemsIdMap) { - if (info instanceof WorkspaceItemInfo) { - WorkspaceItemInfo si = (WorkspaceItemInfo) info; + if (info instanceof WorkspaceItemInfo si) { if (si.isPromise() && si.getTargetComponent() != null) { updateHandler.addPackagesToIgnore( si.user, si.getTargetComponent().getPackageName()); } - } else if (info instanceof LauncherAppWidgetInfo) { - LauncherAppWidgetInfo lawi = (LauncherAppWidgetInfo) info; + } else if (info instanceof LauncherAppWidgetInfo lawi) { if (lawi.hasRestoreFlag(LauncherAppWidgetInfo.FLAG_PROVIDER_NOT_READY)) { updateHandler.addPackagesToIgnore( lawi.user, lawi.providerName.getPackageName()); @@ -651,33 +577,6 @@ public class LoaderTask implements Runnable { } } - private void sanitizeFolders(boolean itemsDeleted) { - if (itemsDeleted) { - // Remove any empty folder - IntArray deletedFolderIds = mModel.getModelDbController().deleteEmptyFolders(); - synchronized (mBgDataModel) { - for (int folderId : deletedFolderIds) { - mBgDataModel.itemsIdMap.remove(folderId); - } - } - } - } - - /** Cleans up app pairs if they don't have the right number of member apps (2). */ - private void sanitizeAppPairs() { - IntArray deletedAppPairIds = mModel.getModelDbController().deleteBadAppPairs(); - IntArray deletedAppIds = mModel.getModelDbController().deleteUnparentedApps(); - - IntArray deleted = new IntArray(); - deleted.addAll(deletedAppPairIds); - deleted.addAll(deletedAppIds); - - synchronized (mBgDataModel) { - for (int id : deleted) { - mBgDataModel.itemsIdMap.remove(id); - } - } - } private void sanitizeWidgetsShortcutsAndPackages() { // Remove any ghost widgets diff --git a/src/com/android/launcher3/model/ModelDbController.java b/src/com/android/launcher3/model/ModelDbController.java index d998cdd284..569f2e883f 100644 --- a/src/com/android/launcher3/model/ModelDbController.java +++ b/src/com/android/launcher3/model/ModelDbController.java @@ -484,6 +484,7 @@ public class ModelDbController { * @return Ids of deleted folders. */ @WorkerThread + @Nullable public IntArray deleteEmptyFolders() { createDbIfNotExists(); @@ -506,7 +507,7 @@ public class ModelDbController { return folderIds; } catch (SQLException ex) { Log.e(TAG, ex.getMessage(), ex); - return new IntArray(); + return null; } } @@ -515,6 +516,7 @@ public class ModelDbController { * @return Ids of deleted app pairs. */ @WorkerThread + @Nullable public IntArray deleteBadAppPairs() { createDbIfNotExists(); @@ -538,7 +540,7 @@ public class ModelDbController { return appPairIds; } catch (SQLException ex) { Log.e(TAG, ex.getMessage(), ex); - return new IntArray(); + return null; } } @@ -547,6 +549,7 @@ public class ModelDbController { * @return Ids of deleted apps. */ @WorkerThread + @Nullable public IntArray deleteUnparentedApps() { createDbIfNotExists(); @@ -568,7 +571,7 @@ public class ModelDbController { return appIds; } catch (SQLException ex) { Log.e(TAG, ex.getMessage(), ex); - return new IntArray(); + return null; } } diff --git a/src/com/android/launcher3/model/ModelDelegate.java b/src/com/android/launcher3/model/ModelDelegate.java index d845b3b836..dc3b5085e8 100644 --- a/src/com/android/launcher3/model/ModelDelegate.java +++ b/src/com/android/launcher3/model/ModelDelegate.java @@ -24,6 +24,8 @@ import androidx.annotation.WorkerThread; import com.android.launcher3.LauncherModel; import com.android.launcher3.dagger.ApplicationContext; +import com.android.launcher3.model.data.ItemInfo; +import com.android.launcher3.util.IntSparseArrayMap; import javax.inject.Inject; @@ -61,15 +63,7 @@ public class ModelDelegate { /** Load workspace items (for example, those in the hot seat) if any in the data model */ @WorkerThread - public void loadAndBindWorkspaceItems() { } - - /** Load all apps items if any in the data model */ - @WorkerThread - public void loadAndBindAllAppsItems() { } - - /** Load other items like widget recommendations if any in the data model */ - @WorkerThread - public void loadAndBindOtherItems() { } + public void loadAndAddExtraModelItems(@NonNull IntSparseArrayMap outLoadedItems) { } /** Marks the ModelDelegate as active */ public void markActive() { } diff --git a/src/com/android/launcher3/model/ModelWriter.java b/src/com/android/launcher3/model/ModelWriter.java index d591a75383..8c4b7101dd 100644 --- a/src/com/android/launcher3/model/ModelWriter.java +++ b/src/com/android/launcher3/model/ModelWriter.java @@ -256,7 +256,7 @@ public class ModelWriter { mModel.getModelDbController().insert(writer.getValues(mContext)); synchronized (mBgDataModel) { checkItemInfoLocked(item.id, item, stackTrace); - mBgDataModel.addItem(mContext, item, true, mOwner); + mBgDataModel.addItem(mContext, item, mOwner); verifier.verifyModel(); } }).executeOnModelThread(); diff --git a/src/com/android/launcher3/model/WorkspaceItemProcessor.kt b/src/com/android/launcher3/model/WorkspaceItemProcessor.kt index 3648ca55a9..0cd8573466 100644 --- a/src/com/android/launcher3/model/WorkspaceItemProcessor.kt +++ b/src/com/android/launcher3/model/WorkspaceItemProcessor.kt @@ -27,10 +27,13 @@ import android.graphics.Point import android.text.TextUtils import android.util.Log import android.util.LongSparseArray +import android.util.SparseArray import com.android.launcher3.Flags import com.android.launcher3.InvariantDeviceProfile import com.android.launcher3.LauncherSettings.Favorites import com.android.launcher3.backuprestore.LauncherRestoreEventLogger.RestoreError +import com.android.launcher3.folder.Folder +import com.android.launcher3.folder.FolderGridOrganizer.createFolderGridOrganizer import com.android.launcher3.icons.CacheableShortcutInfo import com.android.launcher3.icons.IconCache import com.android.launcher3.icons.cache.CacheLookupFlag.Companion.DEFAULT_LOOKUP_FLAG @@ -39,6 +42,7 @@ import com.android.launcher3.model.data.AppInfo import com.android.launcher3.model.data.AppPairInfo import com.android.launcher3.model.data.FolderInfo import com.android.launcher3.model.data.IconRequestInfo +import com.android.launcher3.model.data.ItemInfo import com.android.launcher3.model.data.ItemInfoWithIcon import com.android.launcher3.model.data.LauncherAppWidgetInfo import com.android.launcher3.model.data.WorkspaceItemInfo @@ -48,6 +52,8 @@ import com.android.launcher3.shortcuts.ShortcutKey import com.android.launcher3.shortcuts.ShortcutRequest import com.android.launcher3.util.ApiWrapper import com.android.launcher3.util.ApplicationInfoWrapper +import com.android.launcher3.util.IntArray +import com.android.launcher3.util.IntSparseArrayMap import com.android.launcher3.util.PackageManagerHelper import com.android.launcher3.util.PackageUserKey import com.android.launcher3.widget.LauncherAppWidgetProviderInfo @@ -73,7 +79,6 @@ class WorkspaceItemProcessor( private val idp: InvariantDeviceProfile, private val iconCache: IconCache, private val isSafeMode: Boolean, - private val bgDataModel: BgDataModel, private val installingPkgs: HashMap, private val isSdCardReady: Boolean, private val widgetInflater: WidgetInflater, @@ -83,6 +88,8 @@ class WorkspaceItemProcessor( private val allDeepShortcuts: MutableList, ) { + private val loadedItems = IntSparseArrayMap() + private val tempPackageKey = PackageUserKey(null, null) /** @@ -402,7 +409,7 @@ class WorkspaceItemProcessor( info.setProgressLevel(installProgress, PackageInstallInfo.STATUS_INSTALLING) } } - c.checkAndAddItem(info, bgDataModel, memoryLogger) + c.checkAndAddItem(info, loadedItems, memoryLogger) } else { throw RuntimeException("Unexpected null WorkspaceItemInfo") } @@ -434,7 +441,7 @@ class WorkspaceItemProcessor( * stored in the BgDataModel. */ private fun processFolderOrAppPair() { - var collection = c.findOrMakeFolder(c.id, bgDataModel) + var collection = c.findOrMakeFolder(c.id, loadedItems) // If we generated a placeholder Folder before this point, it may need to be replaced with // an app pair. if (c.itemType == Favorites.ITEM_TYPE_APP_PAIR && collection is FolderInfo) { @@ -457,7 +464,7 @@ class WorkspaceItemProcessor( } c.markRestored() - c.checkAndAddItem(collection, bgDataModel, memoryLogger) + c.checkAndAddItem(collection, loadedItems, memoryLogger) } /** @@ -599,7 +606,75 @@ class WorkspaceItemProcessor( logWidgetInfo(idp, lapi) } } - c.checkAndAddItem(appWidgetInfo, bgDataModel, memoryLogger) + c.checkAndAddItem(appWidgetInfo, loadedItems, memoryLogger) + } + + /** + * After all items have been processed and added to the BgDataModel, this method can correctly + * rank items inside folders and load the correct miniature preview icons to be shown when the + * folder is collapsed. + */ + private fun processFolderItems() { + // Sort the folder items, update ranks, and make sure all preview items are high res. + val verifiers = idp.supportedProfiles.map { createFolderGridOrganizer(it) } + for (itemInfo in loadedItems) { + if (itemInfo !is FolderInfo) { + continue + } + + itemInfo.getContents().sortWith(Folder.ITEM_POS_COMPARATOR) + verifiers.forEach { it.setFolderInfo(itemInfo) } + + // Update ranks here to ensure there are no gaps caused by removed folder items. + // Ranks are the source of truth for folder items, so cellX and cellY can be + // ignored for now. Database will be updated once user manually modifies folder. + itemInfo.getContents().forEachIndexed { rank, info -> + info.rank = rank + if ( + info is WorkspaceItemInfo && + info.matchingLookupFlag.isVisuallyLessThan(Favorites.DESKTOP_ICON_FLAG) && + info.itemType == Favorites.ITEM_TYPE_APPLICATION && + verifiers.any { it.isItemInPreview(info.rank) } + ) { + iconCache.getTitleAndIcon(info, Favorites.DESKTOP_ICON_FLAG) + } + } + } + } + + private fun removeItems(ids: IntArray?) = ids?.forEach { loadedItems.remove(it) } + + /** + * Applies any queued update data update tasks and data sanity checks and returns the final set + * of workspace data. This includes: + * 1) Loading any additional model data, not coming from the DB + * 2) Sanity checks on folder and app pair: removing empty and single item folders, and sorting + * contents + * 3) Committing any persistent modifications and deletions to the storage + */ + fun finalizeData( + delegate: ModelDelegate, + modelDbController: ModelDbController, + ): SparseArray { + delegate.loadAndAddExtraModelItems(loadedItems) + delegate.markActive() + + // Remove dead items + val itemsDeleted = c.commitDeleted() + + processFolderItems() + // After all items have been processed and added to the BgDataModel, this method + // requests high-res icons for the items that are part of an app pair. + loadedItems.forEach { if (it is AppPairInfo) it.fetchHiResIconsIfNeeded(iconCache) } + c.commitRestoredItems() + if (itemsDeleted) { + // Remove any empty folder + removeItems(modelDbController.deleteEmptyFolders()) + } + // Cleans up app pairs if they don't have the right number of member apps (2). + removeItems(modelDbController.deleteBadAppPairs()) + removeItems(modelDbController.deleteUnparentedApps()) + return loadedItems } companion object { diff --git a/src/com/android/launcher3/model/data/WorkspaceData.kt b/src/com/android/launcher3/model/data/WorkspaceData.kt new file mode 100644 index 0000000000..cb27987b74 --- /dev/null +++ b/src/com/android/launcher3/model/data/WorkspaceData.kt @@ -0,0 +1,133 @@ +/* + * Copyright (C) 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.launcher3.model.data + +import android.util.SparseArray +import androidx.core.util.putAll +import androidx.core.util.valueIterator +import com.android.launcher3.BuildConfig +import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_DESKTOP +import com.android.launcher3.Workspace +import com.android.launcher3.util.IntArray +import com.android.launcher3.util.IntSet +import java.util.Collections +import java.util.stream.Stream +import java.util.stream.StreamSupport + +/** + * An immutable representation of all the workspace items (shortcuts, folders, widgets and predicted + * items) + */ +sealed interface WorkspaceData : Iterable { + + /** Creates an array of valid workspace screens based on current items in the model. */ + fun collectWorkspaceScreens(): IntArray { + val screenSet = IntSet() + forEach { if (it.container == CONTAINER_DESKTOP) screenSet.add(it.screenId) } + if (BuildConfig.QSB_ON_FIRST_SCREEN || screenSet.isEmpty) { + screenSet.add(Workspace.FIRST_SCREEN_ID) + } + return screenSet.array + } + + /** Returns the [ItemInfo] associated with the [id] or null */ + operator fun get(id: Int): ItemInfo? + + fun stream(): Stream = StreamSupport.stream(spliterator(), false) + + /** Version determines the uniqueness per model load cycle */ + val version: Int + + /** + * Returns the predicted items for the provided [containerId] or an empty list id no such + * container exists + */ + fun getPredictedContents(containerId: Int): List = + get(containerId).let { if (it is PredictedContainerInfo) it.getContents() else null } + ?: Collections.emptyList() + + /** Returns an immutable copy of the dataset */ + fun copy(): WorkspaceData + + /** A mutable implementation of [WorkspaceData] */ + class MutableWorkspaceData : WorkspaceData { + + private val itemsIdMap = SparseArray() + + override var version: Int = 0 + + private var modificationId: Int = 0 + + override fun iterator() = itemsIdMap.valueIterator() + + override fun get(id: Int): ItemInfo? = itemsIdMap.get(id) + + /** Replaces the existing dataset with [items] */ + fun replaceDataMap(items: SparseArray) { + itemsIdMap.clear() + itemsIdMap.putAll(items) + version++ + modificationId = 0 + } + + /** Adds the [item] to the dataset */ + fun addItem(item: ItemInfo, owner: Any?) { + itemsIdMap[item.id] = item + modificationId++ + } + + /** Removes existing [items] from the dataset */ + fun removeItems(items: Collection, owner: Any?) { + items.forEach { itemsIdMap.remove(it.id) } + modificationId++ + } + + /** Replaces an existing [item] from the dataset */ + fun replaceItem(item: ItemInfo, owner: Any?) { + itemsIdMap[item.id] = item + notifyItemsUpdated(listOf(item), owner) + } + + /** + * Notifies this dataset that or updates already performed on existing [items]. Since the + * underlying [ItemInfo]s are mutable objects, its possible to update their properties + * without going though this dataset + */ + fun notifyItemsUpdated(items: List, owner: Any?) { + modificationId++ + } + + override fun copy(): WorkspaceData = + ImmutableWorkspaceData(version, modificationId, itemsIdMap) + } + + /** An immutable implementation of [WorkspaceData] */ + class ImmutableWorkspaceData( + override val version: Int, + private val modificationId: Int, + items: SparseArray, + ) : WorkspaceData { + + private val itemsIdMap = items.clone() + + override fun iterator() = itemsIdMap.valueIterator() + + override fun get(id: Int): ItemInfo? = itemsIdMap.get(id) + + override fun copy(): WorkspaceData = this + } +} diff --git a/src/com/android/launcher3/model/repository/HomeScreenRepository.kt b/src/com/android/launcher3/model/repository/HomeScreenRepository.kt index 625fe9fc9c..c150735202 100644 --- a/src/com/android/launcher3/model/repository/HomeScreenRepository.kt +++ b/src/com/android/launcher3/model/repository/HomeScreenRepository.kt @@ -16,20 +16,13 @@ package com.android.launcher3.model.repository +import android.util.SparseArray import com.android.launcher3.dagger.LauncherAppSingleton -import com.android.launcher3.model.BgDataModel -import com.android.launcher3.model.data.ItemInfo -import com.android.launcher3.model.repository.HomeScreenRepository.WorkspaceData.ChangeEvent -import com.android.launcher3.util.Executors -import com.android.launcher3.util.IntSparseArrayMap -import java.util.concurrent.CopyOnWriteArrayList -import java.util.function.Consumer +import com.android.launcher3.model.data.WorkspaceData +import com.android.launcher3.model.data.WorkspaceData.ImmutableWorkspaceData import javax.inject.Inject -import kotlinx.coroutines.MainScope -import kotlinx.coroutines.cancel -import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.callbackFlow +import kotlinx.coroutines.flow.asStateFlow /** * Repository for the home screen data. @@ -40,74 +33,14 @@ import kotlinx.coroutines.flow.callbackFlow @LauncherAppSingleton class HomeScreenRepository @Inject constructor() { - /** - * Represents the current home screen data model. There are two ways this can change: - * 1) The model can be replaced completely with a new data, which can be observed using the - * state flow. - * 2) Changes can be made to the existing data, the diff can be observed using - * [WorkspaceData.updates] - */ - val workspaceStateFlow = MutableStateFlow(WorkspaceData(IntSparseArrayMap())) + private val mutableStateFlow: MutableStateFlow = + MutableStateFlow(ImmutableWorkspaceData(0, 0, SparseArray())) - class WorkspaceData(var itemsIdMap: IntSparseArrayMap) { + /** Represents the current home screen data model. There are two ways this can change: */ + val workspaceStateFlow = mutableStateFlow.asStateFlow() - val scope = MainScope() - - internal val updateListeners = CopyOnWriteArrayList>() - - val updates = - callbackFlow { - val listener = Consumer { trySend(it) } - updateListeners.add(listener) - awaitClose { updateListeners.remove(listener) } - } - - /** Represents a change being made to the existing workspace data */ - sealed interface ChangeEvent { - // The items being changed - val items: List - - // The source of the change. If its user driven, it will point to the UI component where - // the user is interacting or null if the change was made as a result of some system - // event. Clients can use this to exclude self-made changes. - val owner: Any? - - /** New items were added to the model */ - data class AddEvent(override val items: List, override val owner: Any?) : - ChangeEvent - - /** Some properties of existing items changed */ - data class UpdateEvent(override val items: List, override val owner: Any?) : - ChangeEvent - - /** Some items were removed from the model */ - data class RemoveEvent(override val items: List, override val owner: Any?) : - ChangeEvent - } - } - - /** - * Used to notify that the model data was completely replaced. This is only meant to be used by - * the model, clients should just rely on the events provided by the StateFlow - */ - fun onNewBind(model: BgDataModel) { - val items = model.itemsIdMap.clone() - - Executors.MAIN_EXECUTOR.execute { - workspaceStateFlow.value.scope.cancel() - workspaceStateFlow.value = WorkspaceData(items) - } - } - - /** - * Used to notify a particular change to the workspace data. This is only meant to be used by - * the model, clients should just rely on the events provided by the StateFlow - */ - fun dispatchChange(model: BgDataModel, event: ChangeEvent) { - val items = model.itemsIdMap.clone() - Executors.MAIN_EXECUTOR.execute { - workspaceStateFlow.value.itemsIdMap = items - workspaceStateFlow.value.updateListeners.forEach { it.accept(event) } - } + /** sets a new value to [workspaceStateFlow] */ + fun dispatchChange(workspaceData: WorkspaceData) { + mutableStateFlow.value = workspaceData } } diff --git a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java index 7ca211ae55..03b7eeed07 100644 --- a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java +++ b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java @@ -54,11 +54,11 @@ import com.android.launcher3.model.data.AppInfo; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.ItemInfoWithIcon; import com.android.launcher3.model.data.PredictedContainerInfo; +import com.android.launcher3.model.data.WorkspaceData; import com.android.launcher3.popup.PopupContainerWithArrow; import com.android.launcher3.popup.PopupDataProvider; import com.android.launcher3.touch.ItemClickHandler.ItemClickProxy; import com.android.launcher3.util.ComponentKey; -import com.android.launcher3.util.IntSparseArrayMap; import com.android.launcher3.util.PackageUserKey; import com.android.launcher3.util.Preconditions; import com.android.launcher3.util.Themes; @@ -254,7 +254,7 @@ public class SecondaryDisplayLauncher extends BaseActivity @Override public void bindCompleteModel( - @NonNull IntSparseArrayMap itemIdMap, boolean isBindingSync) { + @NonNull WorkspaceData itemIdMap, boolean isBindingSync) { if (itemIdMap.get(CONTAINER_ALL_APPS_PREDICTION) instanceof PredictedContainerInfo pci) { mSecondaryDisplayQuickstepDelegate.setPredictedApps(pci); } diff --git a/tests/multivalentTests/src/com/android/launcher3/model/PackageUpdatedTaskTest.kt b/tests/multivalentTests/src/com/android/launcher3/model/PackageUpdatedTaskTest.kt index 86f19ee9cf..b8f553e921 100644 --- a/tests/multivalentTests/src/com/android/launcher3/model/PackageUpdatedTaskTest.kt +++ b/tests/multivalentTests/src/com/android/launcher3/model/PackageUpdatedTaskTest.kt @@ -124,7 +124,7 @@ class PackageUpdatedTaskTest { // Given val taskUnderTest = PackageUpdatedTask(OP_ADD, mUser, expectedPackage) // When - mDataModel.addItem(mContext, expectedWorkspaceItem, true) + mDataModel.addItem(mContext, expectedWorkspaceItem) TestUtil.runOnExecutorSync(Executors.MODEL_EXECUTOR) { taskUnderTest.execute(mockTaskController, mDataModel, mAllAppsList) } @@ -142,7 +142,7 @@ class PackageUpdatedTaskTest { // Given val taskUnderTest = PackageUpdatedTask(OP_UPDATE, mUser, expectedPackage) // When - mDataModel.addItem(mContext, expectedWorkspaceItem, true) + mDataModel.addItem(mContext, expectedWorkspaceItem) TestUtil.runOnExecutorSync(Executors.MODEL_EXECUTOR) { taskUnderTest.execute(mockTaskController, mDataModel, mAllAppsList) } @@ -159,7 +159,7 @@ class PackageUpdatedTaskTest { // Given val taskUnderTest = PackageUpdatedTask(OP_REMOVE, mUser, expectedPackage) // When - mDataModel.addItem(mContext, expectedWorkspaceItem, true) + mDataModel.addItem(mContext, expectedWorkspaceItem) TestUtil.runOnExecutorSync(Executors.MODEL_EXECUTOR) { taskUnderTest.execute(mockTaskController, mDataModel, mAllAppsList) } @@ -175,7 +175,7 @@ class PackageUpdatedTaskTest { // Given val taskUnderTest = PackageUpdatedTask(OP_UNAVAILABLE, mUser, expectedPackage) // When - mDataModel.addItem(mContext, expectedWorkspaceItem, true) + mDataModel.addItem(mContext, expectedWorkspaceItem) TestUtil.runOnExecutorSync(Executors.MODEL_EXECUTOR) { taskUnderTest.execute(mockTaskController, mDataModel, mAllAppsList) } @@ -190,7 +190,7 @@ class PackageUpdatedTaskTest { // Given val taskUnderTest = PackageUpdatedTask(OP_SUSPEND, mUser, expectedPackage) // When - mDataModel.addItem(mContext, expectedWorkspaceItem, true) + mDataModel.addItem(mContext, expectedWorkspaceItem) mAllAppsList.add(AppInfo(mContext, expectedActivityInfo, mUser), expectedActivityInfo) mAllAppsList.getAndResetChangeFlag() doAnswer {}.whenever(mockTaskController).bindApplicationsIfNeeded() @@ -208,7 +208,7 @@ class PackageUpdatedTaskTest { // Given val taskUnderTest = PackageUpdatedTask(OP_UNSUSPEND, mUser, expectedPackage) // When - mDataModel.addItem(mContext, expectedWorkspaceItem, true) + mDataModel.addItem(mContext, expectedWorkspaceItem) mAllAppsList.getAndResetChangeFlag() doAnswer {}.whenever(mockTaskController).bindApplicationsIfNeeded() TestUtil.runOnExecutorSync(Executors.MODEL_EXECUTOR) { @@ -226,7 +226,7 @@ class PackageUpdatedTaskTest { // Given val taskUnderTest = PackageUpdatedTask(OP_USER_AVAILABILITY_CHANGE, mUser, expectedPackage) // When - mDataModel.addItem(mContext, expectedWorkspaceItem, true) + mDataModel.addItem(mContext, expectedWorkspaceItem) TestUtil.runOnExecutorSync(Executors.MODEL_EXECUTOR) { taskUnderTest.execute(mockTaskController, mDataModel, mAllAppsList) } diff --git a/tests/multivalentTests/src/com/android/launcher3/model/ShortcutsChangedTaskTest.kt b/tests/multivalentTests/src/com/android/launcher3/model/ShortcutsChangedTaskTest.kt index cf2aa046e6..8d0288c9d8 100644 --- a/tests/multivalentTests/src/com/android/launcher3/model/ShortcutsChangedTaskTest.kt +++ b/tests/multivalentTests/src/com/android/launcher3/model/ShortcutsChangedTaskTest.kt @@ -38,7 +38,7 @@ import com.android.launcher3.model.data.ItemInfo import com.android.launcher3.model.data.WorkspaceItemInfo import com.android.launcher3.shortcuts.ShortcutKey import com.android.launcher3.util.ComponentKey -import com.android.launcher3.util.IntSparseArrayMap +import com.android.launcher3.util.ModelTestExtensions.initItems import com.android.launcher3.util.SandboxApplication import com.google.common.truth.Truth.assertThat import java.util.function.Predicate @@ -105,8 +105,7 @@ class ShortcutsChangedTaskTest { whenever(id).thenReturn(expectedShortcutId) } ) - val items: IntSparseArrayMap = bgDataModel.itemsIdMap - items.put(expectedWai.id, expectedWai) + bgDataModel.initItems(expectedWai) doReturn( ApplicationInfo().apply { enabled = true @@ -135,8 +134,7 @@ class ShortcutsChangedTaskTest { whenever(id).thenReturn(expectedShortcutId) } ) - val items: IntSparseArrayMap = bgDataModel.itemsIdMap - items.put(expectedWai.id, expectedWai) + bgDataModel.initItems(expectedWai) doReturn( ApplicationInfo().apply { enabled = true @@ -168,8 +166,7 @@ class ShortcutsChangedTaskTest { whenever(id).thenReturn(expectedShortcutId) } ) - val items: IntSparseArrayMap = bgDataModel.itemsIdMap - items.put(expectedWai.id, expectedWai) + bgDataModel.initItems(expectedWai) doReturn( ApplicationInfo().apply { enabled = true @@ -197,8 +194,7 @@ class ShortcutsChangedTaskTest { whenever(id).thenReturn(expectedShortcutId) } ) - val items: IntSparseArrayMap = bgDataModel.itemsIdMap - items.put(expectedWai.id, expectedWai) + bgDataModel.initItems(expectedWai) doReturn( ApplicationInfo().apply { enabled = true @@ -227,8 +223,7 @@ class ShortcutsChangedTaskTest { whenever(id).thenReturn(expectedShortcutId) } ) - val items: IntSparseArrayMap = bgDataModel.itemsIdMap - items.put(expectedWai.id, expectedWai) + bgDataModel.initItems(expectedWai) doReturn( ApplicationInfo().apply { enabled = true @@ -257,8 +252,7 @@ class ShortcutsChangedTaskTest { whenever(id).thenReturn(expectedShortcutId) } ) - val items: IntSparseArrayMap = bgDataModel.itemsIdMap - items.put(expectedWai.id, expectedWai) + bgDataModel.initItems(expectedWai) doReturn( ApplicationInfo().apply { enabled = true @@ -347,8 +341,7 @@ class ShortcutsChangedTaskTest { whenever(id).thenReturn(expectedShortcutId) } ) - val items: IntSparseArrayMap = bgDataModel.itemsIdMap - items.put(expectedWai.id, expectedWai) + bgDataModel.initItems(expectedWai) doReturn( ApplicationInfo().apply { enabled = true diff --git a/tests/multivalentTests/src/com/android/launcher3/model/WorkspaceItemProcessorTest.kt b/tests/multivalentTests/src/com/android/launcher3/model/WorkspaceItemProcessorTest.kt index 571265879f..7481a0d34f 100644 --- a/tests/multivalentTests/src/com/android/launcher3/model/WorkspaceItemProcessorTest.kt +++ b/tests/multivalentTests/src/com/android/launcher3/model/WorkspaceItemProcessorTest.kt @@ -88,7 +88,6 @@ class WorkspaceItemProcessorTest { @Mock private lateinit var mockIconRequestInfo: IconRequestInfo @Mock private lateinit var mockWorkspaceInfo: WorkspaceItemInfo - @Mock private lateinit var mockBgDataModel: BgDataModel @Mock private lateinit var mockPmHelper: PackageManagerHelper @Mock(answer = Answers.RETURNS_DEEP_STUBS) private lateinit var mockCursor: LoaderCursor @Mock private lateinit var mockUserCache: UserCache @@ -165,7 +164,6 @@ class WorkspaceItemProcessorTest { userManagerState: UserManagerState = mockUserManagerState, launcherApps: LauncherApps = mLauncherApps, shortcutKeyToPinnedShortcuts: Map = mKeyToPinnedShortcutsMap, - bgDataModel: BgDataModel = mockBgDataModel, widgetInflater: WidgetInflater = mockWidgetInflater, pmHelper: PackageManagerHelper = mockPmHelper, iconRequestInfos: MutableList> = mIconRequestInfos, @@ -182,7 +180,6 @@ class WorkspaceItemProcessorTest { userManagerState = userManagerState, launcherApps = launcherApps, context = mContext, - bgDataModel = bgDataModel, widgetInflater = widgetInflater, pmHelper = pmHelper, unlockedUsers = unlockedUsers, @@ -277,7 +274,7 @@ class WorkspaceItemProcessorTest { // currently gets marked restored twice, although markRestore() has check for restoreFlag verify(mockCursor, times(2)).markRestored() assertThat(mIconRequestInfos).containsExactly(mockIconRequestInfo) - verify(mockCursor).checkAndAddItem(mockWorkspaceInfo, mockBgDataModel, null) + verify(mockCursor).checkAndAddItem(eq(mockWorkspaceInfo), any(), anyOrNull()) } @Test @@ -304,7 +301,7 @@ class WorkspaceItemProcessorTest { .isEqualTo(0) verify(mockCursor.updater().put(Favorites.INTENT, mIntent.toUri(0))).commit() assertThat(mIconRequestInfos).containsExactly(mockIconRequestInfo) - verify(mockCursor).checkAndAddItem(mockWorkspaceInfo, mockBgDataModel, null) + verify(mockCursor).checkAndAddItem(eq(mockWorkspaceInfo), any(), anyOrNull()) } @Test @@ -409,7 +406,7 @@ class WorkspaceItemProcessorTest { assertThat(mIconRequestInfos).isNotEmpty() assertThat(mAllDeepShortcuts).isEmpty() verify(mockContentWriter).put(Favorites.RESTORED, expectedRestoreFlag) - verify(mockCursor).checkAndAddItem(any(), eq(mockBgDataModel), eq(null)) + verify(mockCursor).checkAndAddItem(any(), any(), eq(null)) } @Test @@ -540,7 +537,6 @@ class WorkspaceItemProcessorTest { @Test fun `When processing Folder then create FolderInfo and mark restored`() { val actualFolderInfo = FolderInfo() - mockBgDataModel = mock() mockCursor = mock().apply { user = mUserHandle @@ -582,7 +578,7 @@ class WorkspaceItemProcessorTest { assertThat(actualFolderInfo.spanX).isEqualTo(expectedFolderInfo.spanX) assertThat(actualFolderInfo.spanY).isEqualTo(expectedFolderInfo.spanY) assertThat(actualFolderInfo.options).isEqualTo(expectedFolderInfo.options) - verify(mockCursor).checkAndAddItem(actualFolderInfo, mockBgDataModel, null) + verify(mockCursor).checkAndAddItem(eq(actualFolderInfo), any(), anyOrNull()) } @Test @@ -645,8 +641,7 @@ class WorkspaceItemProcessorTest { // Then val widgetInfoCaptor = ArgumentCaptor.forClass(LauncherAppWidgetInfo::class.java) - verify(mockCursor) - .checkAndAddItem(widgetInfoCaptor.capture(), eq(mockBgDataModel), anyOrNull()) + verify(mockCursor).checkAndAddItem(widgetInfoCaptor.capture(), any(), anyOrNull()) val actualWidgetInfo = widgetInfoCaptor.value with(actualWidgetInfo) { assertThat(providerName).isEqualTo(expectedWidgetInfo.providerName) @@ -697,7 +692,7 @@ class WorkspaceItemProcessorTest { itemProcessorUnderTest.processItem() // Then - verify(mockCursor).checkAndAddItem(any(), eq(mockBgDataModel), eq(null)) + verify(mockCursor).checkAndAddItem(any(), any(), eq(null)) } @Test diff --git a/tests/multivalentTests/src/com/android/launcher3/util/ModelTestExtensions.kt b/tests/multivalentTests/src/com/android/launcher3/util/ModelTestExtensions.kt index 7f4f4c8d10..5bddbe4166 100644 --- a/tests/multivalentTests/src/com/android/launcher3/util/ModelTestExtensions.kt +++ b/tests/multivalentTests/src/com/android/launcher3/util/ModelTestExtensions.kt @@ -3,6 +3,7 @@ package com.android.launcher3.util import android.content.ContentValues import android.database.sqlite.SQLiteDatabase import android.os.Process +import android.util.SparseArray import androidx.test.platform.app.InstrumentationRegistry import com.android.launcher3.Flags import com.android.launcher3.LauncherModel @@ -132,4 +133,9 @@ object ModelTestExtensions { .lines() .forEach { sqlStatement -> db.execSQL(sqlStatement) } } + + /** Initializes [BgDataModel.itemsIdMap] with provided [items] */ + fun BgDataModel.initItems(vararg items: ItemInfo) { + dataLoadComplete(SparseArray().apply { items.forEach { this[it.id] = it } }) + } } diff --git a/tests/src/com/android/launcher3/model/LoaderTaskTest.kt b/tests/src/com/android/launcher3/model/LoaderTaskTest.kt index 6ecb86e1d1..4aacb1fa3c 100644 --- a/tests/src/com/android/launcher3/model/LoaderTaskTest.kt +++ b/tests/src/com/android/launcher3/model/LoaderTaskTest.kt @@ -206,7 +206,7 @@ class LoaderTaskTest { .size ) .isAtLeast(8) - assertThat(itemsIdMap.size()).isAtLeast(40) + assertThat(itemsIdMap.count()).isAtLeast(40) } @Test @@ -218,12 +218,11 @@ class LoaderTaskTest { verify(launcherBinder).bindWorkspace(true, false) verify(modelDelegate).workspaceLoadComplete() - verify(modelDelegate).loadAndBindAllAppsItems() + verify(modelDelegate).loadAndAddExtraModelItems(any()) verify(launcherBinder).bindAllApps() verify(iconCacheUpdateHandler, times(4)).updateIcons(any(), any>(), any()) verify(launcherBinder).bindDeepShortcuts() verify(launcherBinder).bindWidgets() - verify(modelDelegate).loadAndBindOtherItems() verify(iconCacheUpdateHandler).finish() verify(modelDelegate).modelLoadComplete() verify(transaction).commit() diff --git a/tests/src/com/android/launcher3/model/ModelMultiCallbacksTest.java b/tests/src/com/android/launcher3/model/ModelMultiCallbacksTest.java index 0c7d590bbb..ef60022b0c 100644 --- a/tests/src/com/android/launcher3/model/ModelMultiCallbacksTest.java +++ b/tests/src/com/android/launcher3/model/ModelMultiCallbacksTest.java @@ -35,8 +35,8 @@ import com.android.launcher3.LauncherModel; import com.android.launcher3.model.BgDataModel.Callbacks; import com.android.launcher3.model.data.AppInfo; import com.android.launcher3.model.data.ItemInfo; +import com.android.launcher3.model.data.WorkspaceData; import com.android.launcher3.util.Executors; -import com.android.launcher3.util.IntSparseArrayMap; import com.android.launcher3.util.LauncherLayoutBuilder; import com.android.launcher3.util.PackageUserKey; import com.android.launcher3.util.SandboxApplication; @@ -176,8 +176,7 @@ public class ModelMultiCallbacksTest { MyCallbacks() { } @Override - public void bindCompleteModel( - IntSparseArrayMap itemIdMap, boolean isBindingSync) { + public void bindCompleteModel(WorkspaceData itemIdMap, boolean isBindingSync) { mItems = itemIdMap.stream().toList(); } diff --git a/tests/src/com/android/launcher3/model/WorkspaceItemProcessorExtraTest.kt b/tests/src/com/android/launcher3/model/WorkspaceItemProcessorExtraTest.kt index 9d234190e6..cfdddca09c 100644 --- a/tests/src/com/android/launcher3/model/WorkspaceItemProcessorExtraTest.kt +++ b/tests/src/com/android/launcher3/model/WorkspaceItemProcessorExtraTest.kt @@ -200,8 +200,7 @@ class WorkspaceItemProcessorExtraTest { ) .commit() val widgetInfoCaptor = ArgumentCaptor.forClass(LauncherAppWidgetInfo::class.java) - verify(mockCursor) - .checkAndAddItem(widgetInfoCaptor.capture(), eq(mockBgDataModel), anyOrNull()) + verify(mockCursor).checkAndAddItem(widgetInfoCaptor.capture(), any(), anyOrNull()) val actualWidgetInfo = widgetInfoCaptor.value with(actualWidgetInfo) { assertThat(providerName).isEqualTo(expectedWidgetInfo.providerName) @@ -262,7 +261,6 @@ class WorkspaceItemProcessorExtraTest { launcherApps: LauncherApps = mockLauncherApps, shortcutKeyToPinnedShortcuts: Map = mKeyToPinnedShortcutsMap, context: Context = mockContext, - bgDataModel: BgDataModel = mockBgDataModel, widgetInflater: WidgetInflater = mockWidgetInflater, pmHelper: PackageManagerHelper = mockPmHelper, iconRequestInfos: MutableList> = mIconRequestInfos, @@ -279,7 +277,6 @@ class WorkspaceItemProcessorExtraTest { userCache = userCache, userManagerState = userManagerState, launcherApps = launcherApps, - bgDataModel = bgDataModel, widgetInflater = widgetInflater, pmHelper = pmHelper, unlockedUsers = unlockedUsers,