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

Commit 29171e8e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Set size compat UI to max layer" into sc-dev am: 3dd7039e 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec7ea6095e6dfe9b7c5a12f884fb0c1bb79c0ef5
parents 43203250 3dd7039e

libs/WindowManager/Shell/src/com/android/wm/shell/sizecompatui/SizeCompatUILayout.java

+11 −2
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ class SizeCompatUILayout { 
                : stableBounds.right - taskBounds.left - mButtonSize;

        final int positionY = stableBounds.bottom - taskBounds.top - mButtonSize;



        mSyncQueue.runInSync(t -> t.setPosition(leash, positionX, positionY));

        updateSurfacePosition(leash, positionX, positionY);

    }



    void updateHintSurfacePosition() {
@@ -303,7 +303,16 @@ class SizeCompatUILayout { 
        final int positionY =

                stableBounds.bottom - taskBounds.top - mPopupOffsetY - mHint.getMeasuredHeight();



        mSyncQueue.runInSync(t -> t.setPosition(leash, positionX, positionY));

        updateSurfacePosition(leash, positionX, positionY);

    }



    private void updateSurfacePosition(SurfaceControl leash, int positionX, int positionY) {

        mSyncQueue.runInSync(t -> {

            t.setPosition(leash, positionX, positionY);

            // The size compat UI should be the topmost child of the Task in case there can be more

            // than one children.

            t.setLayer(leash, Integer.MAX_VALUE);

        });

    }



    int getDisplayId() {