From 057f181f3715e7340bf1618e86fdce118bbf952b Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Wed, 12 Jan 2011 15:35:47 -0800 Subject: [PATCH] Get rid of the silent mode pref on xlarge. Bug: 3344695 Change-Id: I55ccfd2b22ca4aa407646de54a8dd1dfe637c9bd --- res/values-xlarge/bools.xml | 21 +++++++++++++++++++++ res/values/bools.xml | 2 ++ src/com/android/settings/SoundSettings.java | 5 +++++ 3 files changed, 28 insertions(+) create mode 100644 res/values-xlarge/bools.xml diff --git a/res/values-xlarge/bools.xml b/res/values-xlarge/bools.xml new file mode 100644 index 00000000000..bde07d719e5 --- /dev/null +++ b/res/values-xlarge/bools.xml @@ -0,0 +1,21 @@ + + + + + + false + + diff --git a/res/values/bools.xml b/res/values/bools.xml index 61cc79e97c0..f4a95f36e33 100644 --- a/res/values/bools.xml +++ b/res/values/bools.xml @@ -20,4 +20,6 @@ false false + + true diff --git a/src/com/android/settings/SoundSettings.java b/src/com/android/settings/SoundSettings.java index cc38c23691c..23c7096cdb4 100644 --- a/src/com/android/settings/SoundSettings.java +++ b/src/com/android/settings/SoundSettings.java @@ -43,6 +43,7 @@ public class SoundSettings extends SettingsPreferenceFragment implements private static final String KEY_SILENT = "silent"; private static final String KEY_VIBRATE = "vibrate"; + private static final String KEY_RING_VOLUME = "ring_volume"; private static final String KEY_DTMF_TONE = "dtmf_tone"; private static final String KEY_SOUND_EFFECTS = "sound_effects"; private static final String KEY_HAPTIC_FEEDBACK = "haptic_feedback"; @@ -110,6 +111,10 @@ public class SoundSettings extends SettingsPreferenceFragment implements } mSilent = (CheckBoxPreference) findPreference(KEY_SILENT); + if (!getResources().getBoolean(R.bool.has_silent_mode)) { + getPreferenceScreen().removePreference(mSilent); + findPreference(KEY_RING_VOLUME).setDependency(null); + } mVibrate = (ListPreference) findPreference(KEY_VIBRATE); mVibrate.setOnPreferenceChangeListener(this);