am 3a821e86: Merge "Settings: "Rotation lock" retains existing orientation." into jb-dev

* commit '3a821e86f5851cbce1185a481acb88a0f33c98ae':
  Settings: "Rotation lock" retains existing orientation.
This commit is contained in:
John Spurlock
2012-05-23 05:39:01 -07:00
committed by Android Git Automerger

View File

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