summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2012-06-05 19:11:37 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-06-05 19:11:37 -0700
commitde4f8181329441dd57d7402d58de8f314d1757a3 (patch)
treecd5a0372661a9995262aff375302875cafbaf9f6 /src
parent977ff5426d4941c3a190cc55388c89edbd7a1e60 (diff)
parent62a6f626da328889475b35647f76bf439999e28a (diff)
downloadpackages_apps_settings-de4f8181329441dd57d7402d58de8f314d1757a3.zip
packages_apps_settings-de4f8181329441dd57d7402d58de8f314d1757a3.tar.gz
packages_apps_settings-de4f8181329441dd57d7402d58de8f314d1757a3.tar.bz2
Merge "Revert "Settings: "Rotation lock" retains existing orientation."" into jb-dev
Diffstat (limited to 'src')
-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");