Merge "Add grid_x field to DeviceSearchResultContainer." into tm-dev (a37556ae) · Commits · e / os / BlissLauncher3

quickstep/protos_overrides/launcher_atom_extension.proto

+7 −0

Original line number	Diff line number	Diff line
		@@ -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

+8 −4

Original line number	Diff line number	Diff line
		@@ -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();
		}
		}