Merge "Load Delegate Items in correct order when loading Launcher Data." into udc-dev (eac832ae) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java

+66 −26

Original line number	Diff line number	Diff line
		@@ -48,11 +48,15 @@ import android.os.UserHandle;
		import android.util.Log;
		import android.util.StatsEvent;

		import androidx.annotation.AnyThread;
		import androidx.annotation.CallSuper;
		import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;
		import androidx.annotation.WorkerThread;

		import com.android.launcher3.InvariantDeviceProfile;
		import com.android.launcher3.LauncherAppState;
		import com.android.launcher3.config.FeatureFlags;
		import com.android.launcher3.logger.LauncherAtom;
		import com.android.launcher3.logging.InstanceId;
		import com.android.launcher3.logging.InstanceIdSequence;
		@@ -62,6 +66,7 @@ import com.android.launcher3.model.data.FolderInfo;
		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.Executors;
		import com.android.launcher3.util.IntSparseArrayMap;
		import com.android.launcher3.util.PersistedItemArray;
		import com.android.quickstep.logging.SettingsChangeLogger;
		@@ -111,45 +116,80 @@ public class QuickstepModelDelegate extends ModelDelegate {
		mStatsManager = context.getSystemService(StatsManager.class);
		}

		@CallSuper
		@Override
		public void loadHotseatItems(UserManagerState ums,
		Map<ShortcutKey, ShortcutInfo> pinnedShortcuts) {
		// TODO: Implement caching and preloading
		super.loadHotseatItems(ums, pinnedShortcuts);

		WorkspaceItemFactory hotseatFactory = new WorkspaceItemFactory(mApp, ums, pinnedShortcuts,
		mIDP.numDatabaseHotseatIcons, mHotseatState.containerId);
		FixedContainerItems hotseatItems = new FixedContainerItems(mHotseatState.containerId,
		mHotseatState.storage.read(mApp.getContext(), hotseatFactory, ums.allUsers::get));
		mDataModel.extraItems.put(mHotseatState.containerId, hotseatItems);
		public void loadAndBindWorkspaceItems(@NonNull UserManagerState ums,
		@NonNull BgDataModel.Callbacks[] callbacks,
		@NonNull Map<ShortcutKey, ShortcutInfo> pinnedShortcuts) {
		loadAndBindItems(ums, pinnedShortcuts, callbacks, mIDP.numDatabaseHotseatIcons,
		mHotseatState);
		}

		@CallSuper
		@Override
		public void loadAllAppsItems(UserManagerState ums,
		Map<ShortcutKey, ShortcutInfo> pinnedShortcuts) {
		public void loadAndBindAllAppsItems(@NonNull UserManagerState ums,
		@NonNull BgDataModel.Callbacks[] callbacks,
		@NonNull Map<ShortcutKey, ShortcutInfo> pinnedShortcuts) {
		loadAndBindItems(ums, pinnedShortcuts, callbacks, mIDP.numDatabaseAllAppsColumns,
		mAllAppsState);
		}

		@WorkerThread
		private void loadAndBindItems(@NonNull UserManagerState ums,
		@NonNull Map<ShortcutKey, ShortcutInfo> pinnedShortcuts,
		@NonNull BgDataModel.Callbacks[] callbacks,
		int numColumns, @NonNull PredictorState state) {
		// TODO: Implement caching and preloading
		super.loadAllAppsItems(ums, pinnedShortcuts);

		WorkspaceItemFactory allAppsFactory = new WorkspaceItemFactory(mApp, ums, pinnedShortcuts,
		mIDP.numDatabaseAllAppsColumns, mAllAppsState.containerId);
		FixedContainerItems allAppsPredictionItems = new FixedContainerItems(
		mAllAppsState.containerId, mAllAppsState.storage.read(mApp.getContext(),
		allAppsFactory, ums.allUsers::get));
		mDataModel.extraItems.put(mAllAppsState.containerId, allAppsPredictionItems);
		WorkspaceItemFactory factory =
		new WorkspaceItemFactory(mApp, ums, pinnedShortcuts, numColumns, state.containerId);
		FixedContainerItems fci = new FixedContainerItems(state.containerId,
		state.storage.read(mApp.getContext(), factory, ums.allUsers::get));
		if (FeatureFlags.CHANGE_MODEL_DELEGATE_LOADING_ORDER.get()) {
		bindPredictionItems(callbacks, fci);
		}
		mDataModel.extraItems.put(state.containerId, fci);
		}

		@CallSuper
		@Override
		public void loadWidgetsRecommendationItems() {
		// TODO: Implement caching and preloading
		super.loadWidgetsRecommendationItems();
		public void loadAndBindOtherItems(@NonNull BgDataModel.Callbacks[] callbacks) {
		FixedContainerItems widgetPredictionFCI = new FixedContainerItems(
		mWidgetsRecommendationState.containerId, new ArrayList<>());

		// Widgets prediction isn't used frequently. And thus, it is not persisted on disk.
		mDataModel.extraItems.put(mWidgetsRecommendationState.containerId,
		new FixedContainerItems(mWidgetsRecommendationState.containerId,
		new ArrayList<>()));
		mDataModel.extraItems.put(mWidgetsRecommendationState.containerId, widgetPredictionFCI);

		bindPredictionItems(callbacks, widgetPredictionFCI);
		loadStringCache(mDataModel.stringCache);
		}

		@AnyThread
		private void bindPredictionItems(@NonNull BgDataModel.Callbacks[] callbacks,
		@NonNull FixedContainerItems fci) {
		Executors.MAIN_EXECUTOR.execute(() -> {
		for (BgDataModel.Callbacks c : callbacks) {
		c.bindExtraContainerItems(fci);
		}
		});
		}

		@Override
		@WorkerThread
		public void bindAllModelExtras(@NonNull BgDataModel.Callbacks[] callbacks) {
		Iterable<FixedContainerItems> containerItems;
		synchronized (mDataModel.extraItems) {
		containerItems = mDataModel.extraItems.clone();
		}
		Executors.MAIN_EXECUTOR.execute(() -> {
		for (BgDataModel.Callbacks c : callbacks) {
		for (FixedContainerItems fci : containerItems) {
		c.bindExtraContainerItems(fci);
		}
		}
		});
		}

		public void markActive() {
		super.markActive();
		mActive = true;

src/com/android/launcher3/LauncherModel.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -421,6 +421,9 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi
		launcherBinder.bindAllApps();
		launcherBinder.bindDeepShortcuts();
		launcherBinder.bindWidgets();
		if (FeatureFlags.CHANGE_MODEL_DELEGATE_LOADING_ORDER.get()) {
		mModelDelegate.bindAllModelExtras(callbacksList);
		}
		return true;
		} else {
		stopLoader();

src/com/android/launcher3/config/FeatureFlags.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -349,6 +349,11 @@ public final class FeatureFlags {
		"load the current workspace screen visible to the user before the rest rather than "
		+ "loading all of them at once.");

		public static final BooleanFlag CHANGE_MODEL_DELEGATE_LOADING_ORDER = getDebugFlag(251502424,
		"CHANGE_MODEL_DELEGATE_LOADING_ORDER", DISABLED,
		"changes the timing of the loading and binding of delegate items during "
		+ "data preparation for loading the home screen");

		public static final BooleanFlag ENABLE_GRID_ONLY_OVERVIEW = getDebugFlag(270397206,
		"ENABLE_GRID_ONLY_OVERVIEW", DISABLED,
		"Enable a grid-only overview without a focused task.");

src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -229,8 +229,8 @@ public class PreviewSurfaceRenderer {
		query += " or " + LauncherSettings.Favorites.SCREEN + " = "
		+ Workspace.SECOND_SCREEN_ID;
		}
		loadWorkspace(new ArrayList<>(), LauncherSettings.Favorites.PREVIEW_CONTENT_URI,
		query);
		loadWorkspaceForPreviewSurfaceRenderer(new ArrayList<>(),
		LauncherSettings.Favorites.PREVIEW_CONTENT_URI, query);

		final SparseArray<Size> spanInfo =
		getLoadedLauncherWidgetInfo(previewContext.getBaseContext());

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

+13 −3

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@ public abstract class BaseLauncherBinder {
		protected final BgDataModel mBgDataModel;
		private final AllAppsList mBgAllAppsList;

		private final Callbacks[] mCallbacksList;
		final Callbacks[] mCallbacksList;

		private int mMyBindingId;

		@@ -293,8 +293,10 @@ public abstract class BaseLauncherBinder {
		// Load items on the current page.
		bindWorkspaceItems(currentWorkspaceItems, mUiExecutor);
		bindAppWidgets(currentAppWidgets, mUiExecutor);
		if (!FeatureFlags.CHANGE_MODEL_DELEGATE_LOADING_ORDER.get()) {
		mExtraItems.forEach(item ->
		executeCallbacksTask(c -> c.bindExtraContainerItems(item), mUiExecutor));
		}

		RunnableList pendingTasks = new RunnableList();
		Executor pendingExecutor = pendingTasks::add;
		@@ -382,14 +384,22 @@ public abstract class BaseLauncherBinder {
		// Save a copy of all the bg-thread collections
		ArrayList<ItemInfo> workspaceItems;
		ArrayList<LauncherAppWidgetInfo> appWidgets;
		ArrayList<FixedContainerItems> fciList = new ArrayList<>();

		synchronized (mBgDataModel) {
		workspaceItems = new ArrayList<>(mBgDataModel.workspaceItems);
		appWidgets = new ArrayList<>(mBgDataModel.appWidgets);
		if (!FeatureFlags.CHANGE_MODEL_DELEGATE_LOADING_ORDER.get()) {
		mBgDataModel.extraItems.forEach(fciList::add);
		}
		}

		workspaceItems.forEach(it -> mBoundItemIds.add(it.id));
		appWidgets.forEach(it -> mBoundItemIds.add(it.id));
		if (!FeatureFlags.CHANGE_MODEL_DELEGATE_LOADING_ORDER.get()) {
		fciList.forEach(item ->
		executeCallbacksTask(c -> c.bindExtraContainerItems(item), mUiExecutor));
		}

		sortWorkspaceItemsSpatially(mApp.getInvariantDeviceProfile(), workspaceItems);