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

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

Merge "Set mEnterAnimationPending to true if a window was not visible" into qt-dev

parents b6520038 1ffefc21

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -2107,7 +2107,7 @@ public class WindowManagerService extends IWindowManager.Stub 
            if (shouldRelayout) {

            if (shouldRelayout) {

                Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "relayoutWindow: viewVisibility_1");

                Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "relayoutWindow: viewVisibility_1");





                result = win.relayoutVisibleWindow(result, attrChanges, oldVisibility);

                result = win.relayoutVisibleWindow(result, attrChanges);





                try {

                try {

                    result = createSurfaceControl(outSurfaceControl, result, win, winAnimator);

                    result = createSurfaceControl(outSurfaceControl, result, win, winAnimator);

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -4446,7 +4446,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        return !mLastSurfaceInsets.equals(mAttrs.surfaceInsets);

        return !mLastSurfaceInsets.equals(mAttrs.surfaceInsets);

    }

    }





    int relayoutVisibleWindow(int result, int attrChanges, int oldVisibility) {

    int relayoutVisibleWindow(int result, int attrChanges) {

        final boolean wasVisible = isVisibleLw();

        final boolean wasVisible = isVisibleLw();





        result |= (!wasVisible || !isDrawnLw()) ? RELAYOUT_RES_FIRST_TIME : 0;

        result |= (!wasVisible || !isDrawnLw()) ? RELAYOUT_RES_FIRST_TIME : 0;
@@ -4466,7 +4466,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
            mDestroying = false;

            mDestroying = false;

            mWmService.mDestroySurface.remove(this);

            mWmService.mDestroySurface.remove(this);

        }

        }

        if (oldVisibility == View.GONE) {

        if (!wasVisible) {

            mWinAnimator.mEnterAnimationPending = true;

            mWinAnimator.mEnterAnimationPending = true;

        }

        }