commit fe60ac4f263e6f30f21f4933b30c4ee6fee5e6f0
author Federico Baron <fbaron@google.com> Wed Oct 04 19:14:13 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 04 19:14:13 2023 +0000
tree 3b94373ac198706f2824630234064ec261c93476
parent 3dd2c1732ca82d54ca281b75480b7d4444d50588
parent 22a9c3cb7fe6a893ecf7ff57913a23a1e6492ef8

Merge "Add flag check for SMARTSPACE_AS_A_WIDGET to loadertask.java" into main

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

diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index 6ba6642..8059600 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -18,6 +18,7 @@
 
 import static com.android.launcher3.BuildConfig.WIDGET_ON_FIRST_SCREEN;
 import static com.android.launcher3.LauncherSettings.Favorites.TABLE_NAME;
+import static com.android.launcher3.config.FeatureFlags.SMARTSPACE_AS_A_WIDGET;
 import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_HAS_SHORTCUT_PERMISSION;
 import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_QUIET_MODE_CHANGE_PERMISSION;
 import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_QUIET_MODE_ENABLED;
@@ -298,7 +299,8 @@
             logASplit("bindWidgets");
             verifyNotStopped();
 
-            if (LauncherPrefs.get(mApp.getContext()).get(LauncherPrefs.SHOULD_SHOW_SMARTSPACE)) {
+            if (SMARTSPACE_AS_A_WIDGET.get() && LauncherPrefs.get(mApp.getContext())
+                    .get(LauncherPrefs.SHOULD_SHOW_SMARTSPACE)) {
                 mLauncherBinder.bindSmartspaceWidget();
                 // Turn off pref.
                 LauncherPrefs.get(mApp.getContext()).putSync(
@@ -309,6 +311,16 @@
                                 .to(false));
                 logASplit("bindSmartspaceWidget");
                 verifyNotStopped();
+            } else if (!SMARTSPACE_AS_A_WIDGET.get() && WIDGET_ON_FIRST_SCREEN
+                    && !LauncherPrefs.get(mApp.getContext())
+                    .get(LauncherPrefs.SHOULD_SHOW_SMARTSPACE)) {
+                // Turn on pref.
+                LauncherPrefs.get(mApp.getContext()).putSync(
+                        LauncherPrefs.backedUpItem(
+                                        LauncherPrefs.SHOULD_SHOW_SMARTSPACE_KEY,
+                                        WIDGET_ON_FIRST_SCREEN,
+                                        true)
+                                .to(true));
             }
 
             if (FeatureFlags.CHANGE_MODEL_DELEGATE_LOADING_ORDER.get()) {