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

Commit f394ac4e authored by David Stevens's avatar David Stevens Committed by Android (Google) Code Review
Browse files

Merge "Only use WM screen rotation animation on default display" into oc-mr1-dev

parents ad3a36b1 848cf82a

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

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ class ScreenRotationAnimation { 
                // capture a screenshot into the surface we just created

                Surface sur = new Surface();

                sur.copyFrom(mSurfaceControl);

                // FIXME: we should use the proper display

                // TODO(multidisplay): we should use the proper display

                SurfaceControl.screenshot(SurfaceControl.getBuiltInDisplay(

                        SurfaceControl.BUILT_IN_DISPLAY_ID_MAIN), sur);

                mSurfaceControl.setLayerStack(display.getLayerStack());

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

+2 −2
Original line number Diff line number Diff line
@@ -6066,7 +6066,8 @@ public class WindowManagerService extends IWindowManager.Stub 
            Debug.startMethodTracing(file.toString(), 8 * 1024 * 1024);

        }



        if (CUSTOM_SCREEN_ROTATION) {

        // TODO(multidisplay): rotation on non-default displays

        if (CUSTOM_SCREEN_ROTATION && displayContent.isDefaultDisplay) {

            mExitAnimId = exitAnim;

            mEnterAnimId = enterAnim;

            ScreenRotationAnimation screenRotationAnimation =
@@ -6078,7 +6079,6 @@ public class WindowManagerService extends IWindowManager.Stub 
            // Check whether the current screen contains any secure content.

            boolean isSecure = displayContent.hasSecureWindowOnScreen();



            // TODO(multidisplay): rotation on main screen only.

            displayContent.updateDisplayInfo();

            screenRotationAnimation = new ScreenRotationAnimation(mContext, displayContent,

                    mFxSession, inTransaction, mPolicy.isDefaultOrientationForced(), isSecure,