summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2012-06-05 19:18:15 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-05 19:18:15 -0700
commit4eb0bd40d1426b361e6254230d61e81d86d220ca (patch)
treec906fd6685123fd9185fdcb94d116d027afb47b0 /src/com/android
parentebd1a3c5deca5953f4a7b31f325ab7888f88d620 (diff)
parentde4f8181329441dd57d7402d58de8f314d1757a3 (diff)
downloadpackages_apps_settings-4eb0bd40d1426b361e6254230d61e81d86d220ca.zip
packages_apps_settings-4eb0bd40d1426b361e6254230d61e81d86d220ca.tar.gz
packages_apps_settings-4eb0bd40d1426b361e6254230d61e81d86d220ca.tar.bz2
am de4f8181: Merge "Revert "Settings: "Rotation lock" retains existing orientation."" into jb-dev
* commit 'de4f8181329441dd57d7402d58de8f314d1757a3': Revert "Settings: "Rotation lock" retains existing orientation."
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/settings/DisplaySettings.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index e8bd11d..df80f85 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -37,6 +37,7 @@ import android.provider.Settings;
import android.provider.Settings.SettingNotFoundException;
import android.util.Log;
import android.view.IWindowManager;
+import android.view.Surface;
import com.android.settings.DreamSettings;
@@ -259,7 +260,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
if (mAccelerometer.isChecked()) {
wm.thawRotation();
} else {
- wm.freezeRotation(-1);
+ wm.freezeRotation(Surface.ROTATION_0);
}
} catch (RemoteException exc) {
Log.w(TAG, "Unable to save auto-rotate setting");