Merge "Accoutning for the seam on createAreaForResize for cellX position" into tm-qpr-dev am: de86e40592
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21539159 Change-Id: I4f2528ff422af569e1653afabaaf4f6658729173 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -69,17 +69,14 @@ public class MultipageCellLayout extends CellLayout {
|
|||||||
@Override
|
@Override
|
||||||
boolean createAreaForResize(int cellX, int cellY, int spanX, int spanY, View dragView,
|
boolean createAreaForResize(int cellX, int cellY, int spanX, int spanY, View dragView,
|
||||||
int[] direction, boolean commit) {
|
int[] direction, boolean commit) {
|
||||||
|
// Add seam to x position
|
||||||
|
if (cellX > mCountX / 2) {
|
||||||
|
cellX++;
|
||||||
|
}
|
||||||
|
int finalCellX = cellX;
|
||||||
return simulateSeam(
|
return simulateSeam(
|
||||||
() -> super.createAreaForResize(cellX, cellY, spanX, spanY, dragView, direction,
|
() -> super.createAreaForResize(finalCellX, cellY, spanX, spanY, dragView,
|
||||||
commit));
|
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;
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user