Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de86e405 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Accoutning for the seam on createAreaForResize for cellX position" into tm-qpr-dev

parents 4ee5c429 ee1baba8
Loading
Loading
Loading
Loading
+7 −10
Original line number Diff line number Diff line
@@ -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) {
        return simulateSeam(
                () -> super.createAreaForResize(cellX, cellY, spanX, spanY, dragView, direction,
                        commit));
        // Add seam to x position
        if (cellX > mCountX / 2) {
            cellX++;
        }

    @Override
    void regionToCenterPoint(int cellX, int cellY, int spanX, int spanY, int[] result) {
        simulateSeam(() -> {
            super.regionToCenterPoint(cellX, cellY, spanX, spanY, result);
            return 0;
        });
        int finalCellX = cellX;
        return simulateSeam(
                () -> super.createAreaForResize(finalCellX, cellY, spanX, spanY, dragView,
                        direction, commit));
    }

    @Override