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

Commit c991a7ad authored by Rob Carr's avatar Rob Carr Committed by Android (Google) Code Review
Browse files

Merge changes I082e323e,I326bf776 into nyc-mr1-dev 

* changes:
  Limit seamless rotation to TRANSFORM_INVERSE_DISPLAY children.
  Allow seamless rotation before mTopIsFullscreen is set.
parents 13a5f351 aab09158

services/core/java/com/android/server/policy/PhoneWindowManager.java

+1 −1
Original line number Diff line number Diff line
@@ -7758,7 +7758,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        // it and is in the fullscreen opaque state. Seamless rotation

        // requires freezing various Surface states and won't work well

        // with animations, so we disable it in the animation case for now.

        if (w != null  && mTopIsFullscreen && !w.isAnimatingLw() &&

        if (w != null && !w.isAnimatingLw() &&

                ((w.getAttrs().rotationAnimation == ROTATION_ANIMATION_JUMPCUT) ||

                        (w.getAttrs().rotationAnimation == ROTATION_ANIMATION_SEAMLESS))) {

            return true;

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

+14 −0
Original line number Diff line number Diff line
@@ -6772,6 +6772,20 @@ public class WindowManagerService extends IWindowManager.Stub 
                    rotateSeamlessly = false;

                    break;

                }

                // In what can only be called an unfortunate workaround we require

                // seamlessly rotated child windows to have the TRANSFORM_TO_DISPLAY_INVERSE

                // flag. Due to limitations in the client API, there is no way for

                // the client to set this flag in a race free fashion. If we seamlessly rotate

                // a window which does not have this flag, but then gains it, we will get

                // an incorrect visual result (rotated viewfinder). This means if we want to

                // support seamlessly rotating windows which could gain this flag, we can't

                // rotate windows without it. This limits seamless rotation in N to camera framework

                // users, windows without children, and native code. This is unfortunate but

                // having the camera work is our primary goal.

                if (w.isChildWindow() & w.isVisibleNow() &&

                        !w.mWinAnimator.mSurfaceController.getTransformToDisplayInverse()) {

                    rotateSeamlessly = false;

                }

            }

        }