summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/SoundSettings.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/settings/SoundSettings.java')
-rw-r--r--src/com/android/settings/SoundSettings.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/settings/SoundSettings.java b/src/com/android/settings/SoundSettings.java
index a6e0abd..8af0c67 100644
--- a/src/com/android/settings/SoundSettings.java
+++ b/src/com/android/settings/SoundSettings.java
@@ -225,8 +225,14 @@ public class SoundSettings extends SettingsPreferenceFragment implements
mHapticFeedback.setChecked(Settings.System.getInt(resolver,
Settings.System.HAPTIC_FEEDBACK_ENABLED, 1) != 0);
mVolumeAdjustSounds = (CheckBoxPreference) findPreference(KEY_VOLUME_ADJUST_SOUNDS);
- mVolumeAdjustSounds.setChecked(Settings.System.getInt(resolver,
- Settings.System.VOLUME_ADJUST_SOUNDS_ENABLED, 1) != 0);
+ if (mVolumeAdjustSounds != null) {
+ if (!Utils.hasVolumeRocker(getActivity())) {
+ getPreferenceScreen().removePreference(mVolumeAdjustSounds);
+ } else {
+ mVolumeAdjustSounds.setChecked(Settings.System.getInt(resolver,
+ Settings.System.VOLUME_ADJUST_SOUNDS_ENABLED, 1) != 0);
+ }
+ }
mLockSounds = (CheckBoxPreference) findPreference(KEY_LOCK_SOUNDS);
mLockSounds.setPersistent(false);
mLockSounds.setChecked(Settings.System.getInt(resolver,