commit 78ccf9c3e60c560e66d2662c666b4dc886214ba0
author Brian Isganitis <brianji@google.com> Mon Nov 20 21:03:03 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 20 21:03:03 2023 +0000
tree 8f537802357e98402d31b2b3e77e697a0508d08c
parent 940fbe1e2d0e08a85213e8478bc21a48127c5d20
parent 257193a6a11be882cf4ebfa034d5d6f4a2fec863

Merge "Adding TASKBAR entry state for Taskbar Toast." into main

quickstep/protos_overrides/launcher_atom_extension.proto

diff --git a/quickstep/protos_overrides/launcher_atom_extension.proto b/quickstep/protos_overrides/launcher_atom_extension.proto
index b3df353..4dbec98 100644
--- a/quickstep/protos_overrides/launcher_atom_extension.proto
+++ b/quickstep/protos_overrides/launcher_atom_extension.proto
@@ -41,6 +41,7 @@
   // For application, it will be the column number in the apps row.
   optional int32 grid_x = 3;
 
+  // LINT.IfChange
   // Next ID = 4
   message SearchAttributes{
 
@@ -64,6 +65,10 @@
 
       // User entered by swiping up from overview (using Rocket Gesture).
       OVERVIEW = 3;
+
+      // User entered by tapping the search box in the Taskbar AllApps drawer.
+      TASKBAR = 4;
     }
   }
+  // LINT.ThenChange(//quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java)
 }

quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java

diff --git a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
index 71673f3..ac6c274 100644
--- a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
+++ b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
@@ -104,6 +104,8 @@
     private static final int SEARCH_ATTRIBUTES_DIRECT_MATCH = 1 << 1;
     private static final int SEARCH_ATTRIBUTES_ENTRY_STATE_ALL_APPS = 1 << 2;
     private static final int SEARCH_ATTRIBUTES_ENTRY_STATE_QSB = 1 << 3;
+    private static final int SEARCH_ATTRIBUTES_ENTRY_STATE_OVERVIEW = 1 << 4;
+    private static final int SEARCH_ATTRIBUTES_ENTRY_STATE_TASKBAR = 1 << 5;
 
     public static final CopyOnWriteArrayList<StatsLogConsumer> LOGS_CONSUMER =
             new CopyOnWriteArrayList<>();
@@ -856,6 +858,10 @@
             response = response | SEARCH_ATTRIBUTES_ENTRY_STATE_ALL_APPS;
         } else if (searchAttributes.getEntryState() == SearchAttributes.EntryState.QSB) {
             response = response | SEARCH_ATTRIBUTES_ENTRY_STATE_QSB;
+        } else if (searchAttributes.getEntryState() == SearchAttributes.EntryState.OVERVIEW) {
+            response = response | SEARCH_ATTRIBUTES_ENTRY_STATE_OVERVIEW;
+        } else if (searchAttributes.getEntryState() == SearchAttributes.EntryState.TASKBAR) {
+            response = response | SEARCH_ATTRIBUTES_ENTRY_STATE_TASKBAR;
         }
 
         return response;