diff --git a/GITHUB_CHANGELOG.md b/GITHUB_CHANGELOG.md index 5c0fe4a7d4..aed0a921b7 100644 --- a/GITHUB_CHANGELOG.md +++ b/GITHUB_CHANGELOG.md @@ -45,6 +45,7 @@ Compatibility list: * [WM-Shell] Fix conflict with prebuilts aidl, make Release build work again * [Launcher/Desktop] Correct deviceHasLargeScreen check for Baklava * [Lawnchair/Search] Make search layout changes work +* [Lawnchair/Smartspace] Allow disabling the smartspace feature ### 🥞 Snapshot 9 (Development 4 Release 1) diff --git a/lawnchair/src/app/lawnchair/deck/AddFoldersWithItemsTask.kt b/lawnchair/src/app/lawnchair/deck/AddFoldersWithItemsTask.kt index 4a63be1597..0fd8e925a0 100644 --- a/lawnchair/src/app/lawnchair/deck/AddFoldersWithItemsTask.kt +++ b/lawnchair/src/app/lawnchair/deck/AddFoldersWithItemsTask.kt @@ -47,7 +47,7 @@ class AddFoldersWithItemsTask( val addedWorkspaceScreensFinal = IntArray() synchronized(dataModel) { - val workspaceScreens = dataModel.itemsIdMap.collectWorkspaceScreens() + val workspaceScreens = dataModel.itemsIdMap.collectWorkspaceScreens(context) val modelWriter = taskController.getModelWriter() folders.forEach { folderInfo -> @@ -58,6 +58,7 @@ class AddFoldersWithItemsTask( addedItemsFinal, folderInfo.spanX, folderInfo.spanY, + context, ) val screenId = coords[0] val cellX = coords[1] diff --git a/src/com/android/launcher3/ModelCallbacks.kt b/src/com/android/launcher3/ModelCallbacks.kt index ba5c0dbf59..2f93c5cc44 100644 --- a/src/com/android/launcher3/ModelCallbacks.kt +++ b/src/com/android/launcher3/ModelCallbacks.kt @@ -442,7 +442,7 @@ class ModelCallbacks(private var launcher: Launcher) : BgDataModel.Callbacks { MAIN_EXECUTOR.execute { clearPendingBinds() } - val orderedScreenIds = itemIdMap.collectWorkspaceScreens() + val orderedScreenIds = itemIdMap.collectWorkspaceScreens(launcher) val currentScreenIds = getPagesToBindSynchronously(orderedScreenIds) fun setupPendingBind(pendingExecutor: Executor) { diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 43f53af16a..1a433b558f 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -656,13 +656,12 @@ public class Workspace extends PagedView * Initializes and binds the first page */ public void bindAndInitFirstWorkspaceScreen() { - if (!BuildConfigs.QSB_ON_FIRST_SCREEN) { + // Add the first page + CellLayout firstPage = insertNewWorkspaceScreen(Workspace.FIRST_SCREEN_ID, getChildCount()); + if (!PreferenceExtensionsKt.firstBlocking(mPreferenceManager2.getEnableSmartspace())) { mFirstPagePinnedItem = null; return; } - - // Add the first page - CellLayout firstPage = insertNewWorkspaceScreen(Workspace.FIRST_SCREEN_ID, getChildCount()); if (mFirstPagePinnedItem == null) { SmartspaceMode smartspaceMode = PreferenceExtensionsKt .firstBlocking(mPreferenceManager2.getSmartspaceMode()); @@ -1094,7 +1093,7 @@ public class Workspace extends PagedView int id = mWorkspaceScreens.keyAt(i); CellLayout cl = mWorkspaceScreens.valueAt(i); // FIRST_SCREEN_ID can never be removed. - if ((!BuildConfigs.QSB_ON_FIRST_SCREEN || id > FIRST_SCREEN_ID) + if ((!PreferenceExtensionsKt.firstBlocking(PreferenceManager2.INSTANCE.get(getContext()).getEnableSmartspace()) || id > FIRST_SCREEN_ID) && cl.getShortcutsAndWidgets().getChildCount() == 0) { removeScreens.add(id); } diff --git a/src/com/android/launcher3/model/AddWorkspaceItemsTask.java b/src/com/android/launcher3/model/AddWorkspaceItemsTask.java index 466e6d1f25..b1e886b299 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.itemsIdMap.collectWorkspaceScreens(); + IntArray workspaceScreens = dataModel.itemsIdMap.collectWorkspaceScreens(context); List filteredItems = new ArrayList<>(); for (Pair entry : mItemList) { @@ -126,7 +126,7 @@ public class AddWorkspaceItemsTask implements ModelUpdateTask { for (ItemInfo item : filteredItems) { // Find appropriate space for the item. int[] coords = mItemSpaceFinder.findSpaceForItem(workspaceScreens, - addedWorkspaceScreensFinal, addedItemsFinal, item.spanX, item.spanY); + addedWorkspaceScreensFinal, addedItemsFinal, item.spanX, item.spanY, context); int screenId = coords[0]; ItemInfo itemInfo; diff --git a/src/com/android/launcher3/model/DatabaseHelper.java b/src/com/android/launcher3/model/DatabaseHelper.java index b39bdaeb56..d68ac79319 100644 --- a/src/com/android/launcher3/model/DatabaseHelper.java +++ b/src/com/android/launcher3/model/DatabaseHelper.java @@ -34,6 +34,7 @@ import android.util.Log; import androidx.annotation.NonNull; +import app.lawnchair.preferences2.PreferenceManager2; import com.android.launcher3.AutoInstallsLayout; import com.android.launcher3.AutoInstallsLayout.LayoutParserCallback; import com.android.launcher3.BuildConfig; @@ -52,6 +53,7 @@ import com.android.launcher3.util.PackageManagerHelper; import com.android.launcher3.util.Thunk; import com.android.launcher3.widget.LauncherWidgetHolder; +import com.patrykmichalik.opto.core.PreferenceExtensionsKt; import java.io.File; import java.net.URISyntaxException; import java.util.Arrays; @@ -257,7 +259,7 @@ public class DatabaseHelper extends NoLocaleSQLiteHelper implements Favorites.SCREEN, IntArray.wrap(-777, -778)), null); } case 30: { - if (BuildConfigs.QSB_ON_FIRST_SCREEN) { + if (PreferenceExtensionsKt.firstBlocking(PreferenceManager2.INSTANCE.get(mContext).getEnableSmartspace())) { // Clean up first row in screen 0 as it might contain junk data. Log.d(TAG, "Cleaning up first row"); db.delete(Favorites.TABLE_NAME, diff --git a/src/com/android/launcher3/model/GridSizeMigrationDBController.java b/src/com/android/launcher3/model/GridSizeMigrationDBController.java index ded47d8e6d..8352b2c377 100644 --- a/src/com/android/launcher3/model/GridSizeMigrationDBController.java +++ b/src/com/android/launcher3/model/GridSizeMigrationDBController.java @@ -43,6 +43,7 @@ import android.util.Log; import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; +import app.lawnchair.preferences2.PreferenceManager2; import com.android.launcher3.Flags; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.LauncherSettings; @@ -54,6 +55,7 @@ import com.android.launcher3.util.IntArray; import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; import com.android.launcher3.widget.WidgetManagerHelper; +import com.patrykmichalik.opto.core.PreferenceExtensionsKt; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -279,7 +281,8 @@ public class GridSizeMigrationDBController { Log.d(TAG, "Migrating " + screenId); } solveGridPlacement(helper, srcReader, - destReader, screenId, trgX, trgY, workspaceToBeAdded, idsInUse); + destReader, screenId, trgX, trgY, workspaceToBeAdded, idsInUse, + srcReader.mContext); if (workspaceToBeAdded.isEmpty()) { break; } @@ -291,7 +294,7 @@ public class GridSizeMigrationDBController { while (!workspaceToBeAdded.isEmpty()) { solveGridPlacement(helper, srcReader, destReader, screenId, trgX, trgY, workspaceToBeAdded, - srcWorkspaceItems.stream().map(entry -> entry.id).collect(Collectors.toList())); + srcWorkspaceItems.stream().map(entry -> entry.id).collect(Collectors.toList()), srcReader.mContext); screenId++; } @@ -394,11 +397,15 @@ public class GridSizeMigrationDBController { private static void solveGridPlacement(@NonNull final DatabaseHelper helper, @NonNull final DbReader srcReader, @NonNull final DbReader destReader, final int screenId, final int trgX, final int trgY, - @NonNull final List sortedItemsToPlace, List idsInUse) { + @NonNull final List sortedItemsToPlace, List idsInUse, Context context) { + PreferenceManager2 prefs2 = PreferenceManager2.INSTANCE.get(context); + + boolean smartspaceEnabled = PreferenceExtensionsKt.firstBlocking(prefs2.getEnableSmartspace()); + final GridOccupancy occupied = new GridOccupancy(trgX, trgY); final Point trg = new Point(trgX, trgY); final Point next = new Point(0, - screenId == 0 && QSB_ON_FIRST_SCREEN ? 1 /* smartspace */ : 0); + screenId == 0 && smartspaceEnabled ? 1 /* smartspace */ : 0); List existedEntries = destReader.mWorkspaceEntriesByScreenId.get(screenId); if (existedEntries != null) { for (DbEntry entry : existedEntries) { diff --git a/src/com/android/launcher3/model/GridSizeMigrationLogic.kt b/src/com/android/launcher3/model/GridSizeMigrationLogic.kt index 5b0018a5a1..e33e64b31b 100644 --- a/src/com/android/launcher3/model/GridSizeMigrationLogic.kt +++ b/src/com/android/launcher3/model/GridSizeMigrationLogic.kt @@ -20,6 +20,7 @@ import android.database.sqlite.SQLiteDatabase import android.graphics.Point import android.util.Log import androidx.annotation.VisibleForTesting +import app.lawnchair.preferences2.PreferenceManager2 import com.android.launcher3.BuildConfig import com.android.launcher3.BuildConfigs import com.android.launcher3.Flags @@ -43,6 +44,7 @@ import com.android.launcher3.provider.LauncherDbUtils.shiftWorkspaceByXCells import com.android.launcher3.util.CellAndSpan import com.android.launcher3.util.GridOccupancy import com.android.launcher3.util.IntArray +import com.patrykmichalik.opto.core.firstBlocking class GridSizeMigrationLogic { /** @@ -501,8 +503,11 @@ class GridSizeMigrationLogic { val itemsToPlace = WorkspaceItemsToPlace(sortedItemsToPlace, mutableListOf()) val occupied = GridOccupancy(trgX, trgY) val trg = Point(trgX, trgY) + + val prefs2 = PreferenceManager2.INSTANCE.get(context) + val next: Point = - if (screenId == 0 && BuildConfigs.QSB_ON_FIRST_SCREEN) { + if (screenId == 0 && prefs2.enableSmartspace.firstBlocking()) { Point(0, 1 /* smartspace */) } else { Point(0, 0) diff --git a/src/com/android/launcher3/model/LoaderCursor.java b/src/com/android/launcher3/model/LoaderCursor.java index 4cc31a2d3d..2d40df51f5 100644 --- a/src/com/android/launcher3/model/LoaderCursor.java +++ b/src/com/android/launcher3/model/LoaderCursor.java @@ -646,7 +646,7 @@ public class LoaderCursor extends CursorWrapper { if (!mOccupied.containsKey(item.screenId)) { GridOccupancy screen = new GridOccupancy(countX + 1, countY + 1); - if (item.screenId == Workspace.FIRST_SCREEN_ID && BuildConfigs.QSB_ON_FIRST_SCREEN) { + if (item.screenId == Workspace.FIRST_SCREEN_ID && PreferenceExtensionsKt.firstBlocking(preferenceManager2.getEnableSmartspace())) { // Mark the first X columns (X is width of the search container) in the first row as // occupied (if the feature is enabled) in order to account for the search // container. diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java index b941dc6ef3..9a193cb17e 100644 --- a/src/com/android/launcher3/model/LoaderTask.java +++ b/src/com/android/launcher3/model/LoaderTask.java @@ -229,7 +229,7 @@ public class LoaderTask implements Runnable { private void sendFirstScreenActiveInstallsBroadcast() { // Screen set is never empty - IntArray allScreens = mBgDataModel.itemsIdMap.collectWorkspaceScreens(); + IntArray allScreens = mBgDataModel.itemsIdMap.collectWorkspaceScreens(mContext); final int firstScreen = allScreens.get(0); IntSet firstScreens = IntSet.wrap(firstScreen); diff --git a/src/com/android/launcher3/model/WorkspaceItemSpaceFinder.java b/src/com/android/launcher3/model/WorkspaceItemSpaceFinder.java index d9e7a73812..5db08169a8 100644 --- a/src/com/android/launcher3/model/WorkspaceItemSpaceFinder.java +++ b/src/com/android/launcher3/model/WorkspaceItemSpaceFinder.java @@ -17,8 +17,10 @@ package com.android.launcher3.model; import static com.android.launcher3.WorkspaceLayoutManager.FIRST_SCREEN_ID; +import android.content.Context; import android.util.LongSparseArray; +import app.lawnchair.preferences2.PreferenceManager2; import com.android.launcher3.BuildConfig; import com.android.launcher3.BuildConfigs; import com.android.launcher3.InvariantDeviceProfile; @@ -29,6 +31,7 @@ import com.android.launcher3.util.GridOccupancy; import com.android.launcher3.util.IntArray; import com.android.launcher3.util.IntSet; +import com.patrykmichalik.opto.core.PreferenceExtensionsKt; import java.util.ArrayList; import javax.inject.Inject; @@ -56,7 +59,7 @@ public class WorkspaceItemSpaceFinder { * @return screenId and the coordinates for the item in an int array of size 3. */ public int[] findSpaceForItem(IntArray workspaceScreens, IntArray addedWorkspaceScreensFinal, - ArrayList addItemsFinal, int spanX, int spanY) { + ArrayList addItemsFinal, int spanX, int spanY, Context context) { LongSparseArray> screenItems = new LongSparseArray<>(); // Use sBgItemsIdMap as all the items are already loaded. @@ -93,7 +96,9 @@ public class WorkspaceItemSpaceFinder { int screenCount = workspaceScreens.size(); // First check the preferred screen. IntSet screensToExclude = new IntSet(); - if (BuildConfigs.QSB_ON_FIRST_SCREEN) { + + boolean smartspaceEnabled = PreferenceExtensionsKt.firstBlocking(PreferenceManager2.INSTANCE.get(context).getEnableSmartspace()); + if (smartspaceEnabled) { screensToExclude.add(FIRST_SCREEN_ID); } diff --git a/src/com/android/launcher3/model/data/WorkspaceData.kt b/src/com/android/launcher3/model/data/WorkspaceData.kt index ab7ec6bf90..692d0d36c3 100644 --- a/src/com/android/launcher3/model/data/WorkspaceData.kt +++ b/src/com/android/launcher3/model/data/WorkspaceData.kt @@ -16,10 +16,12 @@ package com.android.launcher3.model.data +import android.content.Context import android.util.SparseArray import androidx.annotation.VisibleForTesting import androidx.core.util.putAll import androidx.core.util.valueIterator +import app.lawnchair.preferences2.PreferenceManager2 import com.android.launcher3.BuildConfig import com.android.launcher3.BuildConfigs import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_DESKTOP @@ -30,6 +32,7 @@ import com.android.launcher3.model.data.WorkspaceChangeEvent.UpdateEvent import com.android.launcher3.util.IntArray import com.android.launcher3.util.IntSet import com.android.launcher3.util.ItemInfoMatcher +import com.patrykmichalik.opto.core.firstBlocking import java.util.concurrent.atomic.AtomicInteger import java.util.stream.Stream import java.util.stream.StreamSupport @@ -41,10 +44,14 @@ import java.util.stream.StreamSupport sealed class WorkspaceData : Iterable { /** Creates an array of valid workspace screens based on current items in the model. */ - fun collectWorkspaceScreens(): IntArray { + // LC-Note: Add context to replace QSB_ON_FIRST_SCREEN config + fun collectWorkspaceScreens(context: Context): IntArray { + val prefs2 = PreferenceManager2.INSTANCE.get(context) + val smartspaceEnabled = prefs2.enableSmartspace.firstBlocking() + val screenSet = IntSet() forEach { if (it.container == CONTAINER_DESKTOP) screenSet.add(it.screenId) } - if (BuildConfigs.QSB_ON_FIRST_SCREEN || screenSet.isEmpty) { + if (smartspaceEnabled || screenSet.isEmpty) { screenSet.add(Workspace.FIRST_SCREEN_ID) } return screenSet.array diff --git a/src/com/android/launcher3/preview/LauncherPreviewRenderer.java b/src/com/android/launcher3/preview/LauncherPreviewRenderer.java index b92df26060..eab5572fae 100644 --- a/src/com/android/launcher3/preview/LauncherPreviewRenderer.java +++ b/src/com/android/launcher3/preview/LauncherPreviewRenderer.java @@ -48,6 +48,7 @@ import androidx.annotation.UiThread; import androidx.lifecycle.DefaultLifecycleObserver; import androidx.lifecycle.LifecycleOwner; +import app.lawnchair.preferences2.PreferenceManager2; import com.android.launcher3.BuildConfig; import com.android.launcher3.BuildConfigs; import com.android.launcher3.CellLayout; @@ -77,6 +78,7 @@ import com.android.launcher3.util.window.WindowManagerProxy; import com.android.launcher3.views.BaseDragLayer; import com.android.launcher3.widget.LauncherWidgetHolder; +import com.patrykmichalik.opto.core.PreferenceExtensionsKt; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -106,6 +108,8 @@ public class LauncherPreviewRenderer extends BaseContext private final Hotseat mHotseat; private final Map mWorkspaceScreens = new HashMap<>(); private final ItemInflater mItemInflater; + + private final PreferenceManager2 mPreferenceManager2; public LauncherPreviewRenderer(Context context, int workspaceScreenId, @@ -114,6 +118,8 @@ public class LauncherPreviewRenderer extends BaseContext int themeRes) { super(context, themeRes); + mPreferenceManager2 = PreferenceManager2.getInstance(context); + mUiHandler = new Handler(Looper.getMainLooper()); mIdp = InvariantDeviceProfile.INSTANCE.get(context); mDp = getDeviceProfileForPreview(context).toBuilder(context) @@ -327,7 +333,7 @@ public class LauncherPreviewRenderer extends BaseContext populateHotseatPredictions(itemIdMap); // Add first page QSB - if (BuildConfigs.QSB_ON_FIRST_SCREEN) { + if (PreferenceExtensionsKt.firstBlocking(mPreferenceManager2.getEnableSmartspace())) { CellLayout firstScreen = mWorkspaceScreens.get(FIRST_SCREEN_ID); if (firstScreen != null) { View qsb = mHomeElementInflater.inflate(R.layout.qsb_preview, firstScreen, false);