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

Commit f02bfc7e authored by Naomi Musgrave's avatar Naomi Musgrave Committed by Automerger Merge Worker
Browse files

Merge "Vertically center SCM-eligible on warm launch" into sc-v2-dev am: cb3a43fe am: 1a6c8806 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16357980

Change-Id: Ic52e799ff5ec4e22b7c0cadade0af3c27e7ec098
parents a36195c1 1a6c8806

services/core/java/com/android/server/wm/ActivityRecord.java

+10 −2
Original line number Diff line number Diff line
@@ -7783,9 +7783,17 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        // Above coordinates are in "@" space, now place "*" and "#" to screen space.

        final boolean fillContainer = resolvedBounds.equals(containingBounds);

        final int screenPosX = fillContainer ? containerBounds.left : containerAppBounds.left;

        final int screenPosY = mSizeCompatBounds == null

        // If the activity is not in size compat mode, calculate vertical centering

        //     from the container and resolved bounds.

        // If the activity is in size compat mode, calculate vertical centering

        //     from the container and size compat bounds.

        // The container bounds contain the parent bounds offset in the display, for

        // example when an activity is in the lower split of split screen.

        final int screenPosY = (mSizeCompatBounds == null

                ? (containerBounds.height() - resolvedBounds.height()) / 2

                : (containerBounds.height() - mSizeCompatBounds.height()) / 2;

                : (containerBounds.height() - mSizeCompatBounds.height()) / 2)

                + containerBounds.top;



        if (screenPosX != 0 || screenPosY != 0) {

            if (mSizeCompatBounds != null) {

                mSizeCompatBounds.offset(screenPosX, screenPosY);