From 8763cb57d488a66de019595774083b47b35868db Mon Sep 17 00:00:00 2001 From: Anushree Ganjam Date: Fri, 3 Jun 2022 01:21:05 +0000 Subject: [PATCH] Add grid_x field to DeviceSearchResultContainer. Bug: 233297670 Test: Manual. https://paste.googleplex.com/4745437455056896 Change-Id: I63a0b2ad52282dbf836e5a26c983d3253d2aec43 --- .../protos_overrides/launcher_atom_extension.proto | 7 +++++++ .../quickstep/logging/StatsLogCompatManager.java | 12 ++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/quickstep/protos_overrides/launcher_atom_extension.proto b/quickstep/protos_overrides/launcher_atom_extension.proto index a1566f064d..f5a277bb95 100644 --- a/quickstep/protos_overrides/launcher_atom_extension.proto +++ b/quickstep/protos_overrides/launcher_atom_extension.proto @@ -22,6 +22,7 @@ option java_outer_classname = "LauncherAtomExtensions"; // Wrapper message for containers used at the quickstep level. // Message name should match with launcher_atom_extension.proto message at // the AOSP level. +// Next ID = 3 message ExtendedContainers { reserved 2; // Deleted fields @@ -31,10 +32,16 @@ message ExtendedContainers { } // Represents on-device search result container. +// Next ID = 4 message DeviceSearchResultContainer{ optional int32 query_length = 1; optional SearchAttributes search_attributes = 2; + // [0, m], m varies based on the display density and resolution + // To indicate the location of the tapped on-device search result. + // For application, it will be the column number in the apps row. + optional int32 grid_x = 3; + // Next ID = 4 message SearchAttributes{ // True if results are based on spell corrected query diff --git a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java index 85ef6cb16e..ba9a0ee1a4 100644 --- a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java +++ b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java @@ -574,14 +574,18 @@ public class StatsLogCompatManager extends StatsLogManager { } private static int getGridX(LauncherAtom.ItemInfo info, boolean parent) { - if (info.getContainerInfo().getContainerCase() == FOLDER) { + LauncherAtom.ContainerInfo containerInfo = info.getContainerInfo(); + if (containerInfo.getContainerCase() == FOLDER) { if (parent) { - return info.getContainerInfo().getFolder().getWorkspace().getGridX(); + return containerInfo.getFolder().getWorkspace().getGridX(); } else { - return info.getContainerInfo().getFolder().getGridX(); + return containerInfo.getFolder().getGridX(); } + } else if (containerInfo.getContainerCase() == EXTENDED_CONTAINERS) { + return containerInfo.getExtendedContainers() + .getDeviceSearchResultContainer().getGridX(); } else { - return info.getContainerInfo().getWorkspace().getGridX(); + return containerInfo.getWorkspace().getGridX(); } }