summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Pearce <sop@google.com>2012-07-24 22:08:57 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-07-24 22:08:57 -0700
commit5f8d48324e891fa9953ffa3056ea9d8f03075d96 (patch)
tree5e47eccaf772921c0a5f2e0d6f63a1dbc222a053
parentf574698404bf3f5aeeb2665ae53f165d629e6951 (diff)
parent8d6ff012ed14fb2e0ddad059deea3b1fe74aac3c (diff)
downloadframeworks_base-5f8d48324e891fa9953ffa3056ea9d8f03075d96.zip
frameworks_base-5f8d48324e891fa9953ffa3056ea9d8f03075d96.tar.gz
frameworks_base-5f8d48324e891fa9953ffa3056ea9d8f03075d96.tar.bz2
am 8d6ff012: Merge "Fix 5608959: Make keyguard follow user setting for orientation" into jb-dev
* commit '8d6ff012ed14fb2e0ddad059deea3b1fe74aac3c': Fix 5608959: Make keyguard follow user setting for orientation
-rw-r--r--policy/src/com/android/internal/policy/impl/KeyguardViewManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/KeyguardViewManager.java b/policy/src/com/android/internal/policy/impl/KeyguardViewManager.java
index 504bb63..fb6ff24 100644
--- a/policy/src/com/android/internal/policy/impl/KeyguardViewManager.java
+++ b/policy/src/com/android/internal/policy/impl/KeyguardViewManager.java
@@ -147,7 +147,7 @@ public class KeyguardViewManager implements KeyguardWindowController {
if (enableScreenRotation) {
if (DEBUG) Log.d(TAG, "Rotation sensor for lock screen On!");
- mWindowLayoutParams.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR;
+ mWindowLayoutParams.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_USER;
} else {
if (DEBUG) Log.d(TAG, "Rotation sensor for lock screen Off!");
mWindowLayoutParams.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_NOSENSOR;