diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-04-17 19:14:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-17 19:14:58 +0000 |
| commit | 240407311fcf4153e42f68433f52668ee54648ee (patch) | |
| tree | b2293807e7c6bd68ab6d043a430524c25f79c5db /packages | |
| parent | d838997209f7c279f6d50b8b8a32c44cb174d330 (diff) | |
| parent | 56d46cc95f761eabc6455f3e391835936b7d05e8 (diff) | |
| download | frameworks_base-240407311fcf4153e42f68433f52668ee54648ee.zip frameworks_base-240407311fcf4153e42f68433f52668ee54648ee.tar.gz frameworks_base-240407311fcf4153e42f68433f52668ee54648ee.tar.bz2 | |
am 56d46cc9: Merge "Fix global screen rotation issue."
* commit '56d46cc95f761eabc6455f3e391835936b7d05e8':
Fix global screen rotation issue.
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java index 716e326..d175d7a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java @@ -99,10 +99,14 @@ public class StatusBarWindowManager { } private void adjustScreenOrientation(State state) { - if (!state.isKeyguardShowingAndNotOccluded() || mKeyguardScreenRotation) { - mLp.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_USER; + if (state.isKeyguardShowingAndNotOccluded()) { + if (mKeyguardScreenRotation) { + mLp.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_USER; + } else { + mLp.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_NOSENSOR; + } } else { - mLp.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_NOSENSOR; + mLp.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; } } |