PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add grid_x field to DeviceSearchResultContainer." into tm-dev am: a37556ae5c am: 40ad40ed49 am: adc7347719 am: 69463d8d67

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

Change-Id: Ibf52c61f8a678191c50335069461e27930d5fc1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-06-10 00:12:45 +00:00
committed by Automerger Merge Worker
parent a94404a0f7 69463d8d67
commit f66282dc04
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
+8 -4
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();
}
}