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

Commit b93f0585 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Avoid changing z-order of overlay layer after resizing display" into... 

Merge "Avoid changing z-order of overlay layer after resizing display" into udc-qpr-dev am: bf1b4aa1 am: 31241c3c

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



Change-Id: I24bb814b65aa06c6eb0b05a3f605b49f5ced6b05
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6e33c6df 31241c3c

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

+1 −1
Original line number Diff line number Diff line
@@ -2270,7 +2270,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
            // transitions anyways).

            return wc.getParent().asDisplayContent().getWindowingLayer();

        }

        return wc.getParent().getSurfaceControl();

        return wc.getParentSurfaceControl();

    }



    /**

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

+11 −0
Original line number Diff line number Diff line
@@ -388,12 +388,23 @@ class WindowToken extends WindowContainer<WindowState> { 
    @Override

    SurfaceControl.Builder makeSurface() {

        final SurfaceControl.Builder builder = super.makeSurface();

        // The overlay may use COLOR_MODE_A8 that needs to be at the top of the display to avoid

        // additional memory usage, see b/235601833. Note that getParentSurfaceControl() must use

        // the same parent.

        if (mRoundedCornerOverlay) {

            builder.setParent(null);

        }

        return builder;

    }



    @Override

    public SurfaceControl getParentSurfaceControl() {

        if (mRoundedCornerOverlay) {

            return null;

        }

        return super.getParentSurfaceControl();

    }



    boolean isClientVisible() {

        return mClientVisible;

    }