From 257193a6a11be882cf4ebfa034d5d6f4a2fec863 Mon Sep 17 00:00:00 2001 From: Brian Isganitis Date: Fri, 29 Sep 2023 12:05:53 -0400 Subject: [PATCH] Adding TASKBAR entry state for Taskbar Toast. Bug: 301143233 Test: NA Flag: NA Change-Id: I8d9c5f05329c13348fd2d92d45469d58f40448b8 --- quickstep/protos_overrides/launcher_atom_extension.proto | 5 +++++ .../android/quickstep/logging/StatsLogCompatManager.java | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/quickstep/protos_overrides/launcher_atom_extension.proto b/quickstep/protos_overrides/launcher_atom_extension.proto index b3df353913..4dbec98ce7 100644 --- a/quickstep/protos_overrides/launcher_atom_extension.proto +++ b/quickstep/protos_overrides/launcher_atom_extension.proto @@ -41,6 +41,7 @@ message DeviceSearchResultContainer{ // 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 @@ message DeviceSearchResultContainer{ // 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) } diff --git a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java index b1daac422a..f4930646ae 100644 --- a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java +++ b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java @@ -104,6 +104,8 @@ public class StatsLogCompatManager extends StatsLogManager { 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 LOGS_CONSUMER = new CopyOnWriteArrayList<>(); @@ -848,6 +850,10 @@ public class StatsLogCompatManager extends StatsLogManager { 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;