From 19ab177d1b383748ee477278cd553f5a82a24c34 Mon Sep 17 00:00:00 2001 From: Andy Wickham Date: Wed, 10 Feb 2021 21:36:51 -0800 Subject: [PATCH] Adds CONTAINER_QSB to be used for QSB data. Also updates some related generics definitions for better/simpler compile-time checks. Bug: 178536734 Test: Manual Change-Id: If439b64ad968f62674f856fd3ff465bf21cc9204 --- .../model/QuickstepModelDelegate.java | 11 ++-- .../android/launcher3/LauncherSettings.java | 60 +++++++++++-------- .../plugins/BcSmartspaceDataPlugin.java | 2 +- 3 files changed, 40 insertions(+), 33 deletions(-) diff --git a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java index c3f5c00d75..225823e550 100644 --- a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java +++ b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java @@ -84,7 +84,7 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange private final InvariantDeviceProfile mIDP; private final AppEventProducer mAppEventProducer; - private boolean mActive = false; + protected boolean mActive = false; public QuickstepModelDelegate(Context context) { mAppEventProducer = new AppEventProducer(context, this::onAppTargetEvent); @@ -200,7 +200,6 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange .setPredictedTargetCount(mIDP.numHotseatIcons) .setExtras(convertDataModelToAppTargetBundle(context, mDataModel)) .build())); - } private void registerPredictor(PredictorState state, AppPredictor predictor) { @@ -236,14 +235,14 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange static class PredictorState { public final FixedContainerItems items; - public final PersistedItemArray storage; + public final PersistedItemArray storage; public AppPredictor predictor; private List mLastTargets; PredictorState(int container, String storageName) { items = new FixedContainerItems(container); - storage = new PersistedItemArray(storageName); + storage = new PersistedItemArray<>(storageName); mLastTargets = Collections.emptyList(); } @@ -255,7 +254,7 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange } /** - * Sets the new targets and returns true if it was different than before. + * Sets the new targets and returns true if it was the same as before. */ boolean setTargets(List newTargets) { List oldTargets = mLastTargets; @@ -289,7 +288,7 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange return true; } - private static class WorkspaceItemFactory implements PersistedItemArray.ItemFactory { + private static class WorkspaceItemFactory implements PersistedItemArray.ItemFactory { private final LauncherAppState mAppState; private final UserManagerState mUMS; diff --git a/src/com/android/launcher3/LauncherSettings.java b/src/com/android/launcher3/LauncherSettings.java index be270397d6..dfdc53c1c9 100644 --- a/src/com/android/launcher3/LauncherSettings.java +++ b/src/com/android/launcher3/LauncherSettings.java @@ -74,6 +74,37 @@ public class LauncherSettings { */ public static final int ITEM_TYPE_SHORTCUT = 1; + /** + * The favorite is a user created folder + */ + public static final int ITEM_TYPE_FOLDER = 2; + + /** + * The favorite is a widget + */ + public static final int ITEM_TYPE_APPWIDGET = 4; + + /** + * The favorite is a custom widget provided by the launcher + */ + public static final int ITEM_TYPE_CUSTOM_APPWIDGET = 5; + + /** + * The gesture is an application created deep shortcut + */ + public static final int ITEM_TYPE_DEEP_SHORTCUT = 6; + + /** + * Type of the item is recents task. + * TODO(hyunyoungs): move constants not related to Favorites DB to a better location. + */ + public static final int ITEM_TYPE_TASK = 7; + + /** + * The item is QSB + */ + public static final int ITEM_TYPE_QSB = 8; + /** * The icon package name in Intent.ShortcutIconResource *

Type: TEXT

@@ -170,6 +201,7 @@ public class LauncherSettings { public static final int CONTAINER_SHORTCUTS = -107; public static final int CONTAINER_SETTINGS = -108; public static final int CONTAINER_TASKSWITCHER = -109; + public static final int CONTAINER_QSB = -110; // Represents any of the extended containers implemented in non-AOSP variants. public static final int EXTENDED_CONTAINERS = -200; @@ -195,6 +227,8 @@ public class LauncherSettings { case ITEM_TYPE_APPWIDGET: return "WIDGET"; case ITEM_TYPE_CUSTOM_APPWIDGET: return "CUSTOMWIDGET"; case ITEM_TYPE_DEEP_SHORTCUT: return "DEEPSHORTCUT"; + case ITEM_TYPE_TASK: return "TASK"; + case ITEM_TYPE_QSB: return "QSB"; default: return String.valueOf(type); } } @@ -239,32 +273,6 @@ public class LauncherSettings { */ public static final String PROFILE_ID = "profileId"; - /** - * The favorite is a user created folder - */ - public static final int ITEM_TYPE_FOLDER = 2; - - /** - * The favorite is a widget - */ - public static final int ITEM_TYPE_APPWIDGET = 4; - - /** - * The favorite is a custom widget provided by the launcher - */ - public static final int ITEM_TYPE_CUSTOM_APPWIDGET = 5; - - /** - * The gesture is an application created deep shortcut - */ - public static final int ITEM_TYPE_DEEP_SHORTCUT = 6; - - /** - * Type of the item is recents task. - * TODO(hyunyoungs): move constants not related to Favorites DB to a better location. - */ - public static final int ITEM_TYPE_TASK = 7; - /** * The appWidgetId of the widget * diff --git a/src_plugins/com/android/systemui/plugins/BcSmartspaceDataPlugin.java b/src_plugins/com/android/systemui/plugins/BcSmartspaceDataPlugin.java index b90e43bc64..f8a9a04596 100644 --- a/src_plugins/com/android/systemui/plugins/BcSmartspaceDataPlugin.java +++ b/src_plugins/com/android/systemui/plugins/BcSmartspaceDataPlugin.java @@ -39,6 +39,6 @@ public interface BcSmartspaceDataPlugin extends Plugin { /** Provides Smartspace data to registered listeners. */ interface SmartspaceTargetListener { /** Each Parcelable is a SmartspaceTarget that represents a card. */ - void onSmartspaceTargetsUpdated(List targets); + void onSmartspaceTargetsUpdated(List targets); } }