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

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

Merge "Use current rotation for snapshot of canceling fixed rotation" into... 

Merge "Use current rotation for snapshot of canceling fixed rotation" into sc-dev am: c63b6d1b am: c1a188ef am: e34b1d06

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

Change-Id: I6444cb75ed32ff104c2502202f82a1bae17f80e7
parents 442b48b1 e34b1d06

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

+1 −0
Original line number Diff line number Diff line
@@ -4213,6 +4213,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 


    void clearAllDrawn() {

        allDrawn = false;

        mLastAllDrawn = false;

    }



    /**

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

+10 −1
Original line number Diff line number Diff line
@@ -253,7 +253,16 @@ class ScreenRotationAnimation { 


        ProtoLog.i(WM_SHOW_SURFACE_ALLOC,

                "  FREEZE %s: CREATE", mScreenshotLayer);

        if (originalRotation == realOriginalRotation) {

            setRotation(t, realOriginalRotation);

        } else {

            // If the given original rotation is different from real original display rotation,

            // this is playing non-zero degree rotation animation without display rotation change,

            // so the snapshot doesn't need to be transformed.

            mCurRotation = realOriginalRotation;

            mSnapshotInitialMatrix.reset();

            setRotationTransform(t, mSnapshotInitialMatrix);

        }

        t.apply();

    }