Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I082e323e,I326bf776 into nyc-mr1-dev

Browse Source 
* changes:
  Limit seamless rotation to TRANSFORM_INVERSE_DISPLAY children.
  Allow seamless rotation before mTopIsFullscreen is set.
This commit is contained in:
Rob Carr
2016-08-16 01:31:31 +00:00
committed by Android (Google) Code Review
parent 13a5f3515f aab09158e9
commit c991a7ad54
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -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;

14
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -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;
}
}
}