commit a4e9e2d13259906889f44248ba15ecf4ff2912dc
author android-build-team Robot <android-build-team-robot@google.com> Wed Dec 02 00:07:26 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Dec 02 00:07:26 2020 +0000
tree c0cb28ae7a4e6cde4484b5a67ef7e86a0ea603c6
parent db2bd24c8b963e98a5f868cce66f602c0fa9e3f9
parent ec5e095430a0005f54b90118780193585ec5768e

Snap for 7004988 from ec5e095430a0005f54b90118780193585ec5768e to rvc-qpr2-release

Change-Id: Id60dafadba144629dc47f2dee9db453da39a9fd7

src/com/android/launcher3/model/AppLaunchTracker.java

diff --git a/src/com/android/launcher3/model/AppLaunchTracker.java b/src/com/android/launcher3/model/AppLaunchTracker.java
index 629a0ee..906c2e0 100644
--- a/src/com/android/launcher3/model/AppLaunchTracker.java
+++ b/src/com/android/launcher3/model/AppLaunchTracker.java
@@ -41,6 +41,7 @@
     public static final String CONTAINER_PREDICTIONS = Integer.toString(ContainerType.PREDICTION);
     public static final String CONTAINER_SEARCH = Integer.toString(ContainerType.SEARCHRESULT);
     public static final String CONTAINER_OVERVIEW = Integer.toString(ContainerType.OVERVIEW);
+    public static final String CONTAINER_HOTSEAT = Integer.toString(ContainerType.HOTSEAT);
 
 
     public static final MainThreadInitializedObject<AppLaunchTracker> INSTANCE =

src/com/android/launcher3/touch/ItemClickHandler.java

diff --git a/src/com/android/launcher3/touch/ItemClickHandler.java b/src/com/android/launcher3/touch/ItemClickHandler.java
index 8486666..f50b2b3 100644
--- a/src/com/android/launcher3/touch/ItemClickHandler.java
+++ b/src/com/android/launcher3/touch/ItemClickHandler.java
@@ -19,6 +19,7 @@
 import static com.android.launcher3.Launcher.REQUEST_RECONFIGURE_APPWIDGET;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_FOLDER_OPEN;
 import static com.android.launcher3.model.AppLaunchTracker.CONTAINER_ALL_APPS;
+import static com.android.launcher3.model.AppLaunchTracker.CONTAINER_HOTSEAT;
 import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_DISABLED_BY_PUBLISHER;
 import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_DISABLED_LOCKED_USER;
 import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_DISABLED_QUIET_USER;
@@ -42,6 +43,7 @@
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppWidgetProviderInfo;
+import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.folder.Folder;
@@ -240,6 +242,12 @@
             }
         }
 
+        if (sourceContainer == null && (
+                shortcut.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT
+                        || shortcut.container
+                        == LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION)) {
+            sourceContainer = CONTAINER_HOTSEAT;
+        }
         // Start activities
         startAppShortcutOrInfoActivity(v, shortcut, launcher, sourceContainer);
     }