commit e59246d4e7560d2a43b5a04d053f6ca00405dd6b
author Hyunyoung Song <hyunyoungs@google.com> Fri Nov 12 08:17:58 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Nov 12 08:17:58 2021 +0000
tree f67b0584efda4c48c707fadbbe6ed86e0d2f0fcf
parent 394e2071ec7eb97b1930ba6f7f123d050b640c44
parent 9dfc2ba0a319fe56651f1c0d1601074f58b56c49

Merge "Address AppEventProducer to correctly send search-result location on AppTargetEvent" into sc-v2-dev am: 664f685336 am: 9dfc2ba0a3

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16235837

Change-Id: If3ddb608ddebbf2e8d171ba10379b4d89a3b5a31

quickstep/src/com/android/launcher3/model/AppEventProducer.java

diff --git a/quickstep/src/com/android/launcher3/model/AppEventProducer.java b/quickstep/src/com/android/launcher3/model/AppEventProducer.java
index 1305bbc..7c29c5b 100644
--- a/quickstep/src/com/android/launcher3/model/AppEventProducer.java
+++ b/quickstep/src/com/android/launcher3/model/AppEventProducer.java
@@ -271,9 +271,6 @@
             case ALL_APPS_CONTAINER: {
                 return "all-apps";
             }
-            case SEARCH_RESULT_CONTAINER: {
-                return "search-results";
-            }
             case PREDICTED_HOTSEAT_CONTAINER: {
                 return "predictions/hotseat";
             }
@@ -293,6 +290,16 @@
                 }
                 return "folder";
             }
+            case SEARCH_RESULT_CONTAINER:
+                return "search-results";
+            case EXTENDED_CONTAINERS: {
+                switch(ci.getExtendedContainers().getContainerCase()) {
+                    case DEVICE_SEARCH_RESULT_CONTAINER:
+                    case CORRECTED_DEVICE_SEARCH_RESULT_CONTAINER:
+                        return "search-results";
+                }
+            }
+            default: // fall out
         }
         return "";
     }

quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java

diff --git a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
index 7794d27..e82c900 100644
--- a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
+++ b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java
@@ -329,6 +329,8 @@
         }
         if (state.predictor != null) {
             state.predictor.notifyAppTargetEvent(event);
+            Log.d(TAG, "notifyAppTargetEvent action=" + event.getAction()
+                    + " launchLocation=" + event.getLaunchLocation());
         }
     }