am 6e3212a3: Merge "Fix 3329600: Always enable screen rotation in lockscreen." into honeycomb
* commit '6e3212a38b503e35563ec93c35a6851c99d95c77':
Fix 3329600: Always enable screen rotation in lockscreen.
diff --git a/policy/src/com/android/internal/policy/impl/KeyguardViewManager.java b/policy/src/com/android/internal/policy/impl/KeyguardViewManager.java
index fcd4bf39..edab690 100644
--- a/policy/src/com/android/internal/policy/impl/KeyguardViewManager.java
+++ b/policy/src/com/android/internal/policy/impl/KeyguardViewManager.java
@@ -114,14 +114,12 @@
lp.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN;
lp.windowAnimations = com.android.internal.R.style.Animation_LockScreen;
- if (mContext.getResources().getBoolean(R.bool.config_enableLockScreenRotation)) {
- Log.d(TAG, "Rotation sensor for lock screen On!");
- lp.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR;
- } else {
- Log.d(TAG, "Rotation sensor for lock screen Off!");
- lp.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_NOSENSOR;
- }
-
+ // TODO: Sometimes we get the wrong value for the sensor resource we use to configure
+ // this. However, the current UI design has LockScreen always respond to orientation so
+ // we don't need this for the time-being.
+ //
+ // For reference, the configuration variable is R.bool.config_enableLockScreenRotation
+ lp.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR;
lp.setTitle("Keyguard");
mWindowLayoutParams = lp;