Renaming CONTAINER_PREDICTION to CONTAINER_ALL_APPS_PREDICTION
This avoids confusion with CONTAINER_HOTSEAT_PREDICTION Bug: 390572144 Flag: EXEMPT refactor Test: Presubmit Change-Id: I0e110e2884dd0566bd2e621e60e7458605b9bad7
This commit is contained in:
1 parent
edaab56ed6
commit
07cfe33533
11 files changed
+25
-24
No files matched your search
@@ -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<BaseTaskbarContext> 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
|
||||
|
||||
Reference in new issue
Block a user