am 18e688bd: Merge "Do not display volume settings if volume is fixed" into jb-mr2-dev

* commit '18e688bdd27b2e8821ec08c6775a0b0dae1b9f71':
  Do not display volume settings if volume is fixed
This commit is contained in:
Eric Laurent
2013-03-25 17:16:28 +00:00
committed by Android Git Automerger

View File

@@ -145,6 +145,11 @@ public class SoundSettings extends SettingsPreferenceFragment implements
findPreference(KEY_RING_VOLUME).setDependency(null); findPreference(KEY_RING_VOLUME).setDependency(null);
} }
if (getResources().getBoolean(com.android.internal.R.bool.config_useFixedVolume)) {
// device with fixed volume policy, do not display volumes submenu
getPreferenceScreen().removePreference(findPreference(KEY_RING_VOLUME));
}
mVibrateWhenRinging = (CheckBoxPreference) findPreference(KEY_VIBRATE); mVibrateWhenRinging = (CheckBoxPreference) findPreference(KEY_VIBRATE);
mVibrateWhenRinging.setPersistent(false); mVibrateWhenRinging.setPersistent(false);
mVibrateWhenRinging.setChecked(Settings.System.getInt(resolver, mVibrateWhenRinging.setChecked(Settings.System.getInt(resolver,