summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2012-05-23 05:29:56 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-23 05:29:56 -0700
commit3a821e86f5851cbce1185a481acb88a0f33c98ae (patch)
tree907d62c63e8edd628b755a0661f2ce7a26ec727c
parentff78bf7280b2f435bf09e0df0f252506b1c6af61 (diff)
parent523d5a6e0495580206ee38e5072e5aef8063e806 (diff)
downloadpackages_apps_settings-3a821e86f5851cbce1185a481acb88a0f33c98ae.zip
packages_apps_settings-3a821e86f5851cbce1185a481acb88a0f33c98ae.tar.gz
packages_apps_settings-3a821e86f5851cbce1185a481acb88a0f33c98ae.tar.bz2
Merge "Settings: "Rotation lock" retains existing orientation." into jb-dev
-rw-r--r--src/com/android/settings/DisplaySettings.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 198babc..bad7340 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -37,7 +37,6 @@ 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;
@@ -260,7 +259,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
if (!mRotationLock.isChecked()) {
wm.thawRotation();
} else {
- wm.freezeRotation(Surface.ROTATION_0);
+ wm.freezeRotation(-1);
}
} catch (RemoteException exc) {
Log.w(TAG, "Unable to save auto-rotate setting");