From 261c3a6f6c9af873f05ea5e2ea399f0d90dbb205 Mon Sep 17 00:00:00 2001 From: thiruram Date: Wed, 29 Apr 2020 16:23:15 -0700 Subject: [PATCH] Adds CONTAINER_ALL_APPS to LauncherSettings.Favorites. Change-Id: I6ee81ef4e009ee99754545b5c8686dc0f9e261a2 --- src/com/android/launcher3/LauncherSettings.java | 1 + src/com/android/launcher3/model/data/AppInfo.java | 4 +++- src/com/android/launcher3/model/data/ItemInfo.java | 7 +++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/LauncherSettings.java b/src/com/android/launcher3/LauncherSettings.java index d3af5fca6b..87ead9e7b5 100644 --- a/src/com/android/launcher3/LauncherSettings.java +++ b/src/com/android/launcher3/LauncherSettings.java @@ -152,6 +152,7 @@ public class LauncherSettings { public static final int CONTAINER_HOTSEAT = -101; public static final int CONTAINER_PREDICTION = -102; public static final int CONTAINER_HOTSEAT_PREDICTION = -103; + public static final int CONTAINER_ALL_APPS = -104; public static final String containerToString(int container) { switch (container) { diff --git a/src/com/android/launcher3/model/data/AppInfo.java b/src/com/android/launcher3/model/data/AppInfo.java index ae79f0d95a..b17b062c32 100644 --- a/src/com/android/launcher3/model/data/AppInfo.java +++ b/src/com/android/launcher3/model/data/AppInfo.java @@ -16,6 +16,8 @@ package com.android.launcher3.model.data; +import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APPS; + import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -74,7 +76,7 @@ public class AppInfo extends ItemInfoWithIcon { public AppInfo(LauncherActivityInfo info, UserHandle user, boolean quietModeEnabled) { this.componentName = info.getComponentName(); - this.container = ItemInfo.NO_ID; + this.container = CONTAINER_ALL_APPS; this.user = user; intent = makeLaunchIntent(info); diff --git a/src/com/android/launcher3/model/data/ItemInfo.java b/src/com/android/launcher3/model/data/ItemInfo.java index 561b4ed1f0..12ea888c4f 100644 --- a/src/com/android/launcher3/model/data/ItemInfo.java +++ b/src/com/android/launcher3/model/data/ItemInfo.java @@ -16,6 +16,7 @@ package com.android.launcher3.model.data; +import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_ALL_APPS; 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; @@ -36,6 +37,7 @@ import com.android.launcher3.LauncherSettings; import com.android.launcher3.LauncherSettings.Favorites; import com.android.launcher3.Workspace; import com.android.launcher3.logger.LauncherAtom; +import com.android.launcher3.logger.LauncherAtom.AllAppsContainer; import com.android.launcher3.logger.LauncherAtom.ContainerInfo; import com.android.launcher3.util.ContentWriter; @@ -318,6 +320,11 @@ public class ItemInfo { .setGridY(cellY) .setPageIndex(screenId))); break; + case CONTAINER_ALL_APPS: + itemBuilder.setContainerInfo( + ContainerInfo.newBuilder().setAllAppsContainer( + AllAppsContainer.getDefaultInstance())); + break; } } return itemBuilder.build();