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

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

Merge "Fix missing operation when hiding window for rotation" into tm-dev am: 25b45cfd 

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

Change-Id: Id9ff328e34aa8bdb9e03e3bd76d6410432f191f0
parents e54074a1 25b45cfd

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

+4 −0
Original line number Diff line number Diff line
@@ -329,8 +329,12 @@ class AsyncRotationController extends FadeAnimationController implements Consume 
    void hideImmediately(WindowToken windowToken) {

        final boolean original = mHideImmediately;

        mHideImmediately = true;

        final Operation op = new Operation(Operation.ACTION_FADE);

        mTargetWindowTokens.put(windowToken, op);

        fadeWindowToken(false /* show */, windowToken, ANIMATION_TYPE_FIXED_TRANSFORM);

        op.mLeash = windowToken.getAnimationLeash();

        mHideImmediately = original;

        if (DEBUG) Slog.d(TAG, "hideImmediately " + windowToken.getTopChild());

    }



    /** Returns {@code true} if the window will rotate independently. */

services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java

+4 −1
Original line number Diff line number Diff line
@@ -1370,7 +1370,9 @@ public class DisplayContentTests extends WindowTestsBase { 
                ROTATION_0 /* oldRotation */, ROTATION_90 /* newRotation */,

                false /* forceUpdate */));



        assertNotNull(mDisplayContent.getAsyncRotationController());

        final AsyncRotationController asyncRotationController =

                mDisplayContent.getAsyncRotationController();

        assertNotNull(asyncRotationController);

        assertTrue(mStatusBarWindow.isAnimating(PARENTS, ANIMATION_TYPE_FIXED_TRANSFORM));

        assertTrue(mNavBarWindow.isAnimating(PARENTS, ANIMATION_TYPE_FIXED_TRANSFORM));

        // Notification shade may have its own view animation in real case so do not fade out it.
@@ -1443,6 +1445,7 @@ public class DisplayContentTests extends WindowTestsBase { 
        mDisplayContent.setImeLayeringTarget(mAppWindow);

        LocalServices.getService(WindowManagerInternal.class).onToggleImeRequested(true /* show */,

                app.token, app.token, mDisplayContent.mDisplayId);

        assertTrue(asyncRotationController.isTargetToken(mImeWindow.mToken));

        assertTrue(mImeWindow.mToken.hasFixedRotationTransform());

        assertTrue(mImeWindow.isAnimating(PARENTS, ANIMATION_TYPE_FIXED_TRANSFORM));