Merge "AOD: Use keyguard screen rotation when dozing" into oc-dr1-dev

am: c8c4056756

Change-Id: I265c53deeb8c756c1480d45d50e0dcb98aa0c250
This commit is contained in:
Adrian Roos
2017-06-30 17:02:32 +00:00
committed by android-build-merger

View File

@@ -138,7 +138,7 @@ public class StatusBarWindowManager implements RemoteInputController.Callback, D
} }
private void adjustScreenOrientation(State state) { private void adjustScreenOrientation(State state) {
if (state.isKeyguardShowingAndNotOccluded()) { if (state.isKeyguardShowingAndNotOccluded() || state.dozing) {
if (mKeyguardScreenRotation) { if (mKeyguardScreenRotation) {
mLpChanged.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_USER; mLpChanged.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_USER;
} else { } else {