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

Commit c63b6d1b authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Use current rotation for snapshot of canceling fixed rotation" into sc-dev

parents b23e8bc3 717b2a58

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();

    }