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

Commit 282058d4 authored by Pat Manning's avatar Pat Manning Committed by Automerger Merge Worker
Browse files

Merge "Prevent edit state workspace scale from hiding next pages." into tm-dev am: de5d9718 

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



Change-Id: I57a8af052e5ae512c8685d0c492d286f8e84008b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f764ccea de5d9718

src/com/android/launcher3/DeviceProfile.java

+7 −0
Original line number Diff line number Diff line
@@ -928,6 +928,13 @@ public class DeviceProfile { 
        return workspaceSpringLoadShrunkBottom;

    }



    /**

     * Gets the minimum visible amount of the next workspace page when in the spring-loaded state.

     */

    public float getWorkspaceSpringLoadedMinimumNextPageVisible() {

        return getCellSize().x / 2f;

    }



    public int getWorkspaceWidth() {

        return getWorkspaceWidth(getTotalWorkspacePadding());

    }

src/com/android/launcher3/states/SpringLoadedState.java

+9 −1
Original line number Diff line number Diff line
@@ -53,7 +53,15 @@ public class SpringLoadedState extends LauncherState { 


        float shrunkTop = grid.getWorkspaceSpringLoadShrunkTop();

        float shrunkBottom = grid.getWorkspaceSpringLoadShrunkBottom();

        float scale = (shrunkBottom - shrunkTop) / ws.getNormalChildHeight();

        float scale = Math.min((shrunkBottom - shrunkTop) / ws.getNormalChildHeight(), 1f);



        // Reduce scale if next pages would not be visible after scaling the workspace

        float scaledWorkspaceWidth = ws.getWidth() * scale;

        float maxAvailableWidth =

                ws.getWidth() - (2 * grid.getWorkspaceSpringLoadedMinimumNextPageVisible());

        if (scaledWorkspaceWidth > maxAvailableWidth) {

            scale *= maxAvailableWidth / scaledWorkspaceWidth;

        }



        float halfHeight = ws.getHeight() / 2;

        float myCenter = ws.getTop() + halfHeight;