diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-04-11 03:54:35 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-04-11 03:54:35 -0700 |
| commit | 16b63b97ed96faf7b799713b08436cb3f9121b75 (patch) | |
| tree | 7e3fb75f3305dc46762c3701182de241a5b64671 /src/com/android/settings/cyanogenmod | |
| parent | 1140e44109bb8597eee2cc6ba3350ef14ff91dbe (diff) | |
| parent | 241b17def90ee51f9959892ad37d31544e4b7e92 (diff) | |
| download | packages_apps_settings-16b63b97ed96faf7b799713b08436cb3f9121b75.zip packages_apps_settings-16b63b97ed96faf7b799713b08436cb3f9121b75.tar.gz packages_apps_settings-16b63b97ed96faf7b799713b08436cb3f9121b75.tar.bz2 | |
Merge "Settings: rotation settings for devices with hardware rotation lock" into cm-10.1
Diffstat (limited to 'src/com/android/settings/cyanogenmod')
| -rw-r--r-- | src/com/android/settings/cyanogenmod/DisplayRotation.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/com/android/settings/cyanogenmod/DisplayRotation.java b/src/com/android/settings/cyanogenmod/DisplayRotation.java index 940169d..15b4137 100644 --- a/src/com/android/settings/cyanogenmod/DisplayRotation.java +++ b/src/com/android/settings/cyanogenmod/DisplayRotation.java @@ -74,9 +74,6 @@ public class DisplayRotation extends SettingsPreferenceFragment implements OnPre mAccelerometer = (CheckBoxPreference) findPreference(KEY_ACCELEROMETER); mAccelerometer.setPersistent(false); - if (hasRotationLock) { - mAccelerometer.setEnabled(false); - } mRotation0Pref = (CheckBoxPreference) prefSet.findPreference(ROTATION_0_PREF); mRotation90Pref = (CheckBoxPreference) prefSet.findPreference(ROTATION_90_PREF); mRotation180Pref = (CheckBoxPreference) prefSet.findPreference(ROTATION_180_PREF); @@ -101,6 +98,16 @@ public class DisplayRotation extends SettingsPreferenceFragment implements OnPre mSwapVolumeButtons.setChecked(swapVolumeKeys > 0); } } + + if (hasRotationLock) { + // Disable accelerometer checkbox, but leave others enabled + mAccelerometer.setEnabled(false); + mSwapVolumeButtons.setDependency(null); + mRotation0Pref.setDependency(null); + mRotation90Pref.setDependency(null); + mRotation180Pref.setDependency(null); + mRotation270Pref.setDependency(null); + } } @Override |