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

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

Merge "Capture screenshot for activity when canceling rotation" into main

parents d5d24983 79060377

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

+2 −2
Original line number Diff line number Diff line
@@ -3321,8 +3321,8 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
            mFrozen.add(wc);

            final ChangeInfo changeInfo = Objects.requireNonNull(mChanges.get(wc));

            changeInfo.mSnapshot = snapshotSurface;

            if (isDisplayRotation) {

                // This isn't cheap, so only do it for display rotations.

            if (changeInfo.mRotation != wc.mDisplayContent.getRotation()) {

                // This isn't cheap, so only do it for rotation change.

                changeInfo.mSnapshotLuma = TransitionAnimation.getBorderLuma(

                        buffer, screenshotBuffer.getColorSpace());

            }

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

+1 −0
Original line number Diff line number Diff line
@@ -569,6 +569,7 @@ class WindowToken extends WindowContainer<WindowState> { 
                && asActivityRecord() != null && isVisible()) {

            // Trigger an activity level rotation transition.

            mTransitionController.requestTransitionIfNeeded(WindowManager.TRANSIT_CHANGE, this);

            mTransitionController.collectVisibleChange(this);

            mTransitionController.setReady(this);

        }

        final int originalRotation = getWindowConfiguration().getRotation();