Merge "Revert "Update isLauncherInitialized check to wait until Launcher has stopped binding items"" into main

This commit is contained in:
Priyanka Advani
2023-12-05 19:08:41 +00:00
committed by Android (Google) Code Review

View File

@@ -15,8 +15,8 @@
*/
package com.android.launcher3.testing;
import static com.android.launcher3.Flags.enableGridOnlyOverview;
import static com.android.launcher3.allapps.AllAppsStore.DEFER_UPDATES_TEST;
import static com.android.launcher3.Flags.enableGridOnlyOverview;
import static com.android.launcher3.config.FeatureFlags.FOLDABLE_SINGLE_PAGE;
import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
@@ -297,10 +297,8 @@ public class TestInformationHandler implements ResourceBasedOverride {
}
protected boolean isLauncherInitialized() {
Launcher launcher = Launcher.ACTIVITY_TRACKER.getCreatedActivity();
return launcher == null
|| (LauncherAppState.getInstance(mContext).getModel().isModelLoaded()
&& !launcher.isBindingItems());
return Launcher.ACTIVITY_TRACKER.getCreatedActivity() == null
|| LauncherAppState.getInstance(mContext).getModel().isModelLoaded();
}
protected Activity getCurrentActivity() {