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

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

Merge "Have setRelativeLayer take SurfaceControl instead of IBinder"

parents 04dd93ac 77e34942

core/java/android/view/SurfaceControl.java

+3 −3
Original line number Diff line number Diff line
@@ -715,7 +715,7 @@ public class SurfaceControl { 
        }

    }



    public void setRelativeLayer(IBinder relativeTo, int zorder) {

    public void setRelativeLayer(SurfaceControl relativeTo, int zorder) {

        checkNotReleased();

        synchronized(SurfaceControl.class) {

            sGlobalTransaction.setRelativeLayer(this, relativeTo, zorder);
@@ -1231,9 +1231,9 @@ public class SurfaceControl { 
            return this;

        }



        public Transaction setRelativeLayer(SurfaceControl sc, IBinder relativeTo, int z) {

        public Transaction setRelativeLayer(SurfaceControl sc, SurfaceControl relativeTo, int z) {

            nativeSetRelativeLayer(mNativeObject, sc.mNativeObject,

                    relativeTo, z);

                    relativeTo.getHandle(), z);

            return this;

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ class WindowSurfaceController { 
                if (mAnimator.mWin.usesRelativeZOrdering()) {

                    mSurfaceControl.setRelativeLayer(

                            mAnimator.mWin.getParentWindow()

                            .mWinAnimator.mSurfaceController.mSurfaceControl.getHandle(),

                            .mWinAnimator.mSurfaceController.mSurfaceControl,

                            -1);

                } else {

                    mSurfaceLayer = layer;