aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 03:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Add grid_x field to DeviceSearchResultContainer." into tm-dev am: a37556ae5c

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

Change-Id: I3988fc0e1dd0505f2f638b05159a39672a2be482
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-06-09 22:47:41 +00:00
committed by Automerger Merge Worker
parent af6f7458f0 a37556ae5c
commit 40ad40ed49
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
quickstep/protos_overrides/launcher_atom_extension.proto
View File

@@ -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

12
quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
View File

@@ -582,14 +582,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();
}
}