Merge "Accoutning for the seam on createAreaForResize for cellX position" into tm-qpr-dev am: de86e40592 am: 2e2f4e9f2d

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

Change-Id: I9f6a9ebe6f84e7525189438d10dd27075d72f0e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-02-23 02:07:32 +00:00
committed by Automerger Merge Worker
@@ -69,17 +69,14 @@ public class MultipageCellLayout extends CellLayout {
@Override
boolean createAreaForResize(int cellX, int cellY, int spanX, int spanY, View dragView,
int[] direction, boolean commit) {
// Add seam to x position
if (cellX > mCountX / 2) {
cellX++;
}
int finalCellX = cellX;
return simulateSeam(
() -> super.createAreaForResize(cellX, cellY, spanX, spanY, dragView, direction,
commit));
}
@Override
void regionToCenterPoint(int cellX, int cellY, int spanX, int spanY, int[] result) {
simulateSeam(() -> {
super.regionToCenterPoint(cellX, cellY, spanX, spanY, result);
return 0;
});
() -> super.createAreaForResize(finalCellX, cellY, spanX, spanY, dragView,
direction, commit));
}
@Override