diff --git a/quickstep/src/com/android/launcher3/model/AppEventProducer.java b/quickstep/src/com/android/launcher3/model/AppEventProducer.java index a621259a6b..42e1733cdd 100644 --- a/quickstep/src/com/android/launcher3/model/AppEventProducer.java +++ b/quickstep/src/com/android/launcher3/model/AppEventProducer.java @@ -22,7 +22,7 @@ import static android.app.prediction.AppTargetEvent.ACTION_UNDISMISS; import static android.app.prediction.AppTargetEvent.ACTION_UNPIN; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION; -import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_PREDICTION; +import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APPS_PREDICTION; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_PREDICTION; import static com.android.launcher3.logger.LauncherAtomExtensions.ExtendedContainers.ContainerCase.DEVICE_SEARCH_RESULT_CONTAINER; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_APP_LAUNCH_DRAGDROP; @@ -135,10 +135,10 @@ public class AppEventProducer implements StatsLogConsumer { || event == LAUNCHER_QUICKSWITCH_RIGHT || event == LAUNCHER_QUICKSWITCH_LEFT || event == LAUNCHER_APP_LAUNCH_DRAGDROP) { - sendEvent(atomInfo, ACTION_LAUNCH, CONTAINER_PREDICTION); + sendEvent(atomInfo, ACTION_LAUNCH, CONTAINER_ALL_APPS_PREDICTION); } else if (event == LAUNCHER_ITEM_DROPPED_ON_DONT_SUGGEST || event == LAUNCHER_SYSTEM_SHORTCUT_DONT_SUGGEST_APP_TAP) { - sendEvent(atomInfo, ACTION_DISMISS, CONTAINER_PREDICTION); + sendEvent(atomInfo, ACTION_DISMISS, CONTAINER_ALL_APPS_PREDICTION); } else if (event == LAUNCHER_ITEM_DRAG_STARTED) { mLastDragItem = atomInfo; } else if (event == LAUNCHER_ITEM_DROP_COMPLETED) { @@ -182,7 +182,7 @@ public class AppEventProducer implements StatsLogConsumer { AppTarget target = new AppTarget.Builder(new AppTargetId("launcher:launcher"), mContext.getPackageName(), Process.myUserHandle()) .build(); - sendEvent(target, atomInfo, ACTION_LAUNCH, CONTAINER_PREDICTION); + sendEvent(target, atomInfo, ACTION_LAUNCH, CONTAINER_ALL_APPS_PREDICTION); } else if (event == LAUNCHER_DISMISS_PREDICTION_UNDO) { sendEvent(atomInfo, ACTION_UNDISMISS, CONTAINER_HOTSEAT_PREDICTION); } else if (event == LAUNCHER_WIDGET_ADD_BUTTON_TAP) { diff --git a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java index 74b73d4bdf..ba04b7d7ee 100644 --- a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java +++ b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java @@ -21,7 +21,7 @@ import static android.text.format.DateUtils.formatElapsedTime; import static com.android.launcher3.EncryptionType.ENCRYPTED; import static com.android.launcher3.LauncherPrefs.nonRestorableItem; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION; -import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_PREDICTION; +import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APPS_PREDICTION; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_PREDICTION; import static com.android.launcher3.LauncherSettings.Favorites.DESKTOP_ICON_FLAG; import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION; @@ -110,7 +110,7 @@ public class QuickstepModelDelegate extends ModelDelegate { @VisibleForTesting final PredictorState mAllAppsState = new PredictorState( - CONTAINER_PREDICTION, "all_apps_predictions", DEFAULT_LOOKUP_FLAG); + CONTAINER_ALL_APPS_PREDICTION, "all_apps_predictions", DEFAULT_LOOKUP_FLAG); @VisibleForTesting final PredictorState mHotseatState = new PredictorState( CONTAINER_HOTSEAT_PREDICTION, "hotseat_predictions", DESKTOP_ICON_FLAG); @@ -444,7 +444,7 @@ public class QuickstepModelDelegate extends ModelDelegate { void onAppTargetEvent(AppTargetEvent event, int client) { PredictorState state; switch(client) { - case CONTAINER_PREDICTION: + case CONTAINER_ALL_APPS_PREDICTION: state = mAllAppsState; break; case CONTAINER_WIDGETS_PREDICTION: diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java index 4b977e0d23..5a58a84565 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java @@ -18,7 +18,7 @@ package com.android.launcher3.taskbar; import static com.android.app.animation.Interpolators.FAST_OUT_SLOW_IN; import static com.android.launcher3.AbstractFloatingView.TYPE_TASKBAR_ALL_APPS; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APPS; -import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_PREDICTION; +import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APPS_PREDICTION; import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT; import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_SEARCH_ACTION; import static com.android.launcher3.logger.LauncherAtom.ContainerInfo.ContainerCase.EXTENDED_CONTAINERS; @@ -685,7 +685,7 @@ public class TaskbarDragController extends DragController im if (tag instanceof ItemInfo) { ItemInfo item = (ItemInfo) tag; if (item.container == CONTAINER_ALL_APPS - || item.container == CONTAINER_PREDICTION + || item.container == CONTAINER_ALL_APPS_PREDICTION || isInSearchResultContainer(item)) { if (mDisallowGlobalDrag) { // We're dragging in taskbarAllApps, we don't have folders or shortcuts diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacks.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacks.java index b610f6786e..987271e07d 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacks.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacks.java @@ -88,7 +88,7 @@ public class TaskbarModelCallbacks implements for (FixedContainerItems item: extraItems) { if (item.containerId == Favorites.CONTAINER_HOTSEAT_PREDICTION) { mPredictedItems = item.items; - } else if (item.containerId == Favorites.CONTAINER_PREDICTION) { + } else if (item.containerId == Favorites.CONTAINER_ALL_APPS_PREDICTION) { mControllers.taskbarAllAppsController.setPredictedApps(item.items); } } @@ -170,7 +170,7 @@ public class TaskbarModelCallbacks implements if (item.containerId == Favorites.CONTAINER_HOTSEAT_PREDICTION) { mPredictedItems = item.items; commitItemsToUI(); - } else if (item.containerId == Favorites.CONTAINER_PREDICTION) { + } else if (item.containerId == Favorites.CONTAINER_ALL_APPS_PREDICTION) { mControllers.taskbarAllAppsController.setPredictedApps(item.items); } } diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java index 80f34f6cdb..1ad74adc0b 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java +++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java @@ -542,7 +542,7 @@ public class QuickstepLauncher extends Launcher implements RecentsViewContainer, @Override public void bindExtraContainerItems(FixedContainerItems item) { - if (item.containerId == Favorites.CONTAINER_PREDICTION) { + if (item.containerId == Favorites.CONTAINER_ALL_APPS_PREDICTION) { mAllAppsPredictions = item; PredictionRowView predictionRowView = getAppsView().getFloatingHeaderView().findFixedRowByType( diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/model/QuickstepModelDelegateTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/model/QuickstepModelDelegateTest.kt index 3c2d609433..574effa723 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/model/QuickstepModelDelegateTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/model/QuickstepModelDelegateTest.kt @@ -20,8 +20,8 @@ import android.app.prediction.AppTarget import android.app.prediction.AppTargetEvent import androidx.test.ext.junit.runners.AndroidJUnit4 import com.android.launcher3.LauncherAppState +import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APPS_PREDICTION import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION -import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_PREDICTION import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WALLPAPERS import com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_PREDICTION import com.android.launcher3.util.SandboxApplication @@ -77,7 +77,7 @@ class QuickstepModelDelegateTest { @Test fun onAppTargetEvent_notifyTarget() { - underTest.onAppTargetEvent(mockedAppTargetEvent, CONTAINER_PREDICTION) + underTest.onAppTargetEvent(mockedAppTargetEvent, CONTAINER_ALL_APPS_PREDICTION) verify(allAppsPredictor).notifyAppTargetEvent(mockedAppTargetEvent) verifyNoMoreInteractions(hotseatPredictor) @@ -141,7 +141,7 @@ class QuickstepModelDelegateTest { val appTargetEvent = AppTargetEvent.Builder(target, AppTargetEvent.ACTION_UNPIN).build() underTest.markActive() - underTest.onAppTargetEvent(appTargetEvent, CONTAINER_PREDICTION) + underTest.onAppTargetEvent(appTargetEvent, CONTAINER_ALL_APPS_PREDICTION) verify(allAppsPredictor, never()).destroy() verify(hotseatPredictor, never()).destroy() diff --git a/src/com/android/launcher3/LauncherSettings.java b/src/com/android/launcher3/LauncherSettings.java index b17f44f5ba..4f331ef4da 100644 --- a/src/com/android/launcher3/LauncherSettings.java +++ b/src/com/android/launcher3/LauncherSettings.java @@ -179,7 +179,7 @@ public class LauncherSettings { */ public static final int CONTAINER_DESKTOP = -100; public static final int CONTAINER_HOTSEAT = -101; - public static final int CONTAINER_PREDICTION = -102; + public static final int CONTAINER_ALL_APPS_PREDICTION = -102; public static final int CONTAINER_WIDGETS_PREDICTION = -111; public static final int CONTAINER_HOTSEAT_PREDICTION = -103; public static final int CONTAINER_ALL_APPS = -104; @@ -201,7 +201,7 @@ public class LauncherSettings { switch (container) { case CONTAINER_DESKTOP: return "desktop"; case CONTAINER_HOTSEAT: return "hotseat"; - case CONTAINER_PREDICTION: return "prediction"; + case CONTAINER_ALL_APPS_PREDICTION: return "prediction"; case CONTAINER_ALL_APPS: return "all_apps"; case CONTAINER_WIDGETS_TRAY: return "widgets_tray"; case CONTAINER_SHORTCUTS: return "shortcuts"; diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index db5dc8054e..118f5d454d 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -22,7 +22,7 @@ import static com.android.launcher3.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_DESKTOP; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION; -import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_PREDICTION; +import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APPS_PREDICTION; import static com.android.launcher3.LauncherState.ALL_APPS; import static com.android.launcher3.LauncherState.EDIT_MODE; import static com.android.launcher3.LauncherState.FLAG_MULTI_PAGE; @@ -3369,7 +3369,7 @@ public class Workspace extends PagedView public boolean isContainerSupported(int container) { return container == CONTAINER_DESKTOP || container == CONTAINER_HOTSEAT - || container == CONTAINER_PREDICTION + || container == CONTAINER_ALL_APPS_PREDICTION || container == CONTAINER_HOTSEAT_PREDICTION; } diff --git a/src/com/android/launcher3/model/data/ItemInfo.java b/src/com/android/launcher3/model/data/ItemInfo.java index ad7696cd15..fb544a18bd 100644 --- a/src/com/android/launcher3/model/data/ItemInfo.java +++ b/src/com/android/launcher3/model/data/ItemInfo.java @@ -20,7 +20,7 @@ import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APP import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_DESKTOP; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION; -import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_PREDICTION; +import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APPS_PREDICTION; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_SETTINGS; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_SHORTCUTS; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_TASKSWITCHER; @@ -331,7 +331,8 @@ public class ItemInfo { * Returns if an Item is a predicted item */ public boolean isPredictedItem() { - return container == CONTAINER_HOTSEAT_PREDICTION || container == CONTAINER_PREDICTION; + return container == CONTAINER_HOTSEAT_PREDICTION + || container == CONTAINER_ALL_APPS_PREDICTION; } /** @@ -476,7 +477,7 @@ public class ItemInfo { .setWidgetsContainer( LauncherAtom.WidgetsContainer.getDefaultInstance()) .build(); - case CONTAINER_PREDICTION: + case CONTAINER_ALL_APPS_PREDICTION: return ContainerInfo.newBuilder() .setPredictionContainer(PredictionContainer.getDefaultInstance()) .build(); diff --git a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java index 8c0f8378e3..0c54d49420 100644 --- a/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java +++ b/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncher.java @@ -251,7 +251,7 @@ public class SecondaryDisplayLauncher extends BaseActivity @Override public void bindExtraContainerItems(BgDataModel.FixedContainerItems item) { - if (item.containerId == LauncherSettings.Favorites.CONTAINER_PREDICTION) { + if (item.containerId == LauncherSettings.Favorites.CONTAINER_ALL_APPS_PREDICTION) { mSecondaryDisplayQuickstepDelegate.setPredictedApps(item); } } diff --git a/src/com/android/launcher3/util/ItemInflater.kt b/src/com/android/launcher3/util/ItemInflater.kt index b26a490356..0c73df525b 100644 --- a/src/com/android/launcher3/util/ItemInflater.kt +++ b/src/com/android/launcher3/util/ItemInflater.kt @@ -66,7 +66,7 @@ class ItemInflater( is WorkspaceItemInfo -> item else -> return null } - if (info.container == Favorites.CONTAINER_PREDICTION) { + if (info.container == Favorites.CONTAINER_ALL_APPS_PREDICTION) { // Came from all apps prediction row -- make a copy info = WorkspaceItemInfo(info) }