am de4f8181: Merge "Revert "Settings: "Rotation lock" retains existing orientation."" into jb-dev

* commit 'de4f8181329441dd57d7402d58de8f314d1757a3':
  Revert "Settings: "Rotation lock" retains existing orientation."
This commit is contained in:
Jeff Brown
2012-06-05 19:18:15 -07:00
committed by Android Git Automerger

View File

@@ -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");