From bb85110a0d684dc457ea98bac8da349e3871f721 Mon Sep 17 00:00:00 2001 From: Stefan Andonian Date: Fri, 25 Oct 2024 12:48:59 -0700 Subject: [PATCH] Delete Unused Flag related to Altering how the workspace is loaded. This flagged feature was never released, and instead was thought to be too complicated compared to the benefits in decreased latency. Bug: 251502424 Test: Verified that this launcher still loads properly when this flag is removed. Flag: EXEMPT flag removal Change-Id: I672708e26cb37d1e2b22c4510f9c3500edd4f959 --- .../model/QuickstepModelDelegate.java | 4 --- src/com/android/launcher3/LauncherModel.kt | 8 ++--- .../launcher3/config/FeatureFlags.java | 6 ---- .../launcher3/model/BaseLauncherBinder.java | 6 ++-- .../android/launcher3/model/LoaderTask.java | 32 ++++--------------- 5 files changed, 10 insertions(+), 46 deletions(-) diff --git a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java index 29e1f4e409..2f4c6f614c 100644 --- a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java +++ b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java @@ -59,7 +59,6 @@ import com.android.launcher3.ConstantItem; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherPrefs; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.logger.LauncherAtom; import com.android.launcher3.logging.InstanceId; import com.android.launcher3.logging.InstanceIdSequence; @@ -156,9 +155,6 @@ public class QuickstepModelDelegate extends ModelDelegate { 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); } diff --git a/src/com/android/launcher3/LauncherModel.kt b/src/com/android/launcher3/LauncherModel.kt index a013eaa35b..85ecd58328 100644 --- a/src/com/android/launcher3/LauncherModel.kt +++ b/src/com/android/launcher3/LauncherModel.kt @@ -25,7 +25,6 @@ import android.util.Log import android.util.Pair import androidx.annotation.WorkerThread import com.android.launcher3.celllayout.CellPosMapper -import com.android.launcher3.config.FeatureFlags import com.android.launcher3.icons.IconCache import com.android.launcher3.model.AddWorkspaceItemsTask import com.android.launcher3.model.AllAppsList @@ -67,8 +66,8 @@ class LauncherModel( private val context: Context, private val mApp: LauncherAppState, private val iconCache: IconCache, - private val appFilter: AppFilter, - private val mPmHelper: PackageManagerHelper, + appFilter: AppFilter, + mPmHelper: PackageManagerHelper, isPrimaryInstance: Boolean, ) { @@ -304,9 +303,6 @@ class LauncherModel( launcherBinder.bindAllApps() launcherBinder.bindDeepShortcuts() launcherBinder.bindWidgets() - if (FeatureFlags.CHANGE_MODEL_DELEGATE_LOADING_ORDER.get()) { - this.modelDelegate.bindAllModelExtras(callbacksList) - } return true } else { mLoaderTask = diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 0c891d584c..9e38824158 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -62,12 +62,6 @@ public final class FeatureFlags { * and set a default value for the flag. This will be the default value on Debug builds. *

*/ - // TODO(Block 3): Clean up flags - 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"); - // TODO(Block 6): Clean up flags public static final BooleanFlag SECONDARY_DRAG_N_DROP_TO_PIN = getDebugFlag(270395140, "SECONDARY_DRAG_N_DROP_TO_PIN", DISABLED, diff --git a/src/com/android/launcher3/model/BaseLauncherBinder.java b/src/com/android/launcher3/model/BaseLauncherBinder.java index 7609222c76..b51f855308 100644 --- a/src/com/android/launcher3/model/BaseLauncherBinder.java +++ b/src/com/android/launcher3/model/BaseLauncherBinder.java @@ -313,10 +313,8 @@ public class BaseLauncherBinder { bindItemsInChunks(currentWorkspaceItems, ITEMS_CHUNK, mUiExecutor); bindItemsInChunks(currentAppWidgets, 1, mUiExecutor); } - if (!FeatureFlags.CHANGE_MODEL_DELEGATE_LOADING_ORDER.get()) { - mExtraItems.forEach(item -> - executeCallbacksTask(c -> c.bindExtraContainerItems(item), mUiExecutor)); - } + mExtraItems.forEach(item -> + executeCallbacksTask(c -> c.bindExtraContainerItems(item), mUiExecutor)); RunnableList pendingTasks = new RunnableList(); Executor pendingExecutor = pendingTasks::add; diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java index b0108c274e..06d8b59d33 100644 --- a/src/com/android/launcher3/model/LoaderTask.java +++ b/src/com/android/launcher3/model/LoaderTask.java @@ -287,11 +287,6 @@ public class LoaderTask implements Runnable { } logASplit("loadAllApps"); - if (FeatureFlags.CHANGE_MODEL_DELEGATE_LOADING_ORDER.get()) { - mModelDelegate.loadAndBindAllAppsItems(mUserManagerState, - mLauncherBinder.mCallbacksList, mShortcutKeyToPinnedShortcuts); - logASplit("allAppsDelegateItems"); - } verifyNotStopped(); mLauncherBinder.bindAllApps(); logASplit("bindAllApps"); @@ -356,12 +351,6 @@ public class LoaderTask implements Runnable { prefs.putSync(SHOULD_SHOW_SMARTSPACE.to(true)); } - if (FeatureFlags.CHANGE_MODEL_DELEGATE_LOADING_ORDER.get()) { - mModelDelegate.loadAndBindOtherItems(mLauncherBinder.mCallbacksList); - logASplit("otherDelegateItems"); - verifyNotStopped(); - } - updateHandler.updateIcons(allWidgetsList, CachedObjectCachingLogic.INSTANCE, mApp.getModel()::onWidgetLabelsUpdated); @@ -413,13 +402,6 @@ public class LoaderTask implements Runnable { } logASplit("loadWorkspace"); - if (FeatureFlags.CHANGE_MODEL_DELEGATE_LOADING_ORDER.get()) { - verifyNotStopped(); - mModelDelegate.loadAndBindWorkspaceItems(mUserManagerState, - mLauncherBinder.mCallbacksList, mShortcutKeyToPinnedShortcuts); - mModelDelegate.markActive(); - logASplit("workspaceDelegateItems"); - } mBgDataModel.isFirstPagePinnedItemEnabled = FeatureFlags.QSB_ON_FIRST_SCREEN && (!enableSmartspaceRemovalToggle() || LauncherPrefs.getPrefs( mApp.getContext()).getBoolean(SMARTSPACE_ON_HOME_SCREEN, true)); @@ -490,14 +472,12 @@ public class LoaderTask implements Runnable { IOUtils.closeSilently(c); } - if (!FeatureFlags.CHANGE_MODEL_DELEGATE_LOADING_ORDER.get()) { - mModelDelegate.loadAndBindWorkspaceItems(mUserManagerState, - mLauncherBinder.mCallbacksList, mShortcutKeyToPinnedShortcuts); - mModelDelegate.loadAndBindAllAppsItems(mUserManagerState, - mLauncherBinder.mCallbacksList, mShortcutKeyToPinnedShortcuts); - mModelDelegate.loadAndBindOtherItems(mLauncherBinder.mCallbacksList); - mModelDelegate.markActive(); - } + mModelDelegate.loadAndBindWorkspaceItems(mUserManagerState, + mLauncherBinder.mCallbacksList, mShortcutKeyToPinnedShortcuts); + mModelDelegate.loadAndBindAllAppsItems(mUserManagerState, + mLauncherBinder.mCallbacksList, mShortcutKeyToPinnedShortcuts); + mModelDelegate.loadAndBindOtherItems(mLauncherBinder.mCallbacksList); + mModelDelegate.markActive(); // Break early if we've stopped loading if (mStopped) {