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

Commit a3761ad7 authored by Rob Carr's avatar Rob Carr Committed by Android (Google) Code Review
Browse files

Merge "Extract application window usage of SurfaceController."

parents 3b066041 e6a8351b

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

+2 −1
Original line number Diff line number Diff line
@@ -189,7 +189,8 @@ class AppWindowToken extends WindowToken { 
                        + win.isDrawnLw()

                        + ", isAnimating=" + win.mWinAnimator.isAnimating());

                if (!win.isDrawnLw()) {

                    Slog.v(WindowManagerService.TAG, "Not displayed: s=" + win.mWinAnimator.mSurfaceControl

                    Slog.v(WindowManagerService.TAG, "Not displayed: s=" +

                            win.mWinAnimator.mSurfaceController

                            + " pv=" + win.mPolicyVisibility

                            + " mDrawState=" + win.mWinAnimator.mDrawState

                            + " ah=" + win.mAttachedHidden

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

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ public class BlackFrame { 
            int h = b-t;



            if (WindowManagerService.DEBUG_SURFACE_TRACE) {

                surface = new WindowStateAnimator.SurfaceTrace(session, "BlackSurface("

                surface = new WindowSurfaceController.SurfaceTrace(session, "BlackSurface("

                        + l + ", " + t + ")",

                        w, h, PixelFormat.OPAQUE, SurfaceControl.FX_SURFACE_DIM | SurfaceControl.HIDDEN);

            } else {

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

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ class CircularDisplayMask { 
        SurfaceControl ctrl = null;

        try {

            if (WindowManagerService.DEBUG_SURFACE_TRACE) {

                ctrl = new WindowStateAnimator.SurfaceTrace(session, "CircularDisplayMask",

                ctrl = new WindowSurfaceController.SurfaceTrace(session, "CircularDisplayMask",

                        mScreenSize.x, mScreenSize.y, PixelFormat.TRANSLUCENT,

                        SurfaceControl.HIDDEN);

            } else {

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

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ public class DimLayer { 
        SurfaceControl.openTransaction();

        try {

            if (WindowManagerService.DEBUG_SURFACE_TRACE) {

                mDimSurface = new WindowStateAnimator.SurfaceTrace(service.mFxSession,

                mDimSurface = new WindowSurfaceController.SurfaceTrace(service.mFxSession,

                    "DimSurface",

                    16, 16, PixelFormat.OPAQUE,

                    SurfaceControl.FX_SURFACE_DIM | SurfaceControl.HIDDEN);

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

+2 −2
Original line number Diff line number Diff line
@@ -132,8 +132,8 @@ class DimLayerController { 
                + " dimLayerUser=" + dimLayerUser.toShortString()

                + " newWinAnimator=" + newWinAnimator

                + " state.animator=" + state.animator);

        if (newWinAnimator.mSurfaceShown && (state.animator == null

                || !state.animator.mSurfaceShown

        if (newWinAnimator.getShown() && (state.animator == null

                || !state.animator.getShown()

                || state.animator.mAnimLayer <= newWinAnimator.mAnimLayer)) {

            state.animator = newWinAnimator;

            if (state.animator.mWin.mAppToken == null && !dimLayerUser.isFullscreen()) {