Merge "AriesParts: add controls for CDMA in-call volume settings" into ics

1 files changed, 11 insertions, 0 deletions

diff --git a/AriesParts/src/com/cyanogenmod/settings/device/DeviceSettings.java b/AriesParts/src/com/cyanogenmod/settings/device/DeviceSettings.java
index 42710da..466feeb 100644
--- a/AriesParts/src/com/cyanogenmod/settings/device/DeviceSettings.java
+++ b/AriesParts/src/com/cyanogenmod/settings/device/DeviceSettings.java
@@ -10,6 +10,7 @@ import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
+import android.preference.PreferenceCategory;
 
 public class DeviceSettings extends PreferenceActivity  {
 
@@ -19,6 +20,8 @@ public class DeviceSettings extends PreferenceActivity  {
     public static final String KEY_HSPA = "hspa";
     public static final String KEY_TVOUT_ENABLE = "tvout_enable";
     public static final String KEY_TVOUT_SYSTEM = "tvout_system";
+    public static final String KEY_VOLUME_BOOST = "volume_boost";
+    public static final String KEY_VOLUME_CATEGORY = "category_volume_boost";
 
     private ColorTuningPreference mColorTuning;
     private ListPreference mMdnie;
@@ -27,6 +30,7 @@ public class DeviceSettings extends PreferenceActivity  {
     private CheckBoxPreference mTvOutEnable;
     private ListPreference mTvOutSystem;
     private TvOut mTvOut;
+    private VolumeBoostPreference mVolumeBoost;
 
     private BroadcastReceiver mHeadsetReceiver = new BroadcastReceiver() {
 
@@ -58,6 +62,13 @@ public class DeviceSettings extends PreferenceActivity  {
         mHspa.setEnabled(Hspa.isSupported());
         mHspa.setOnPreferenceChangeListener(new Hspa(this));
 
+        mVolumeBoost = (VolumeBoostPreference) findPreference(KEY_VOLUME_BOOST);
+        if (!VolumeBoostPreference.isSupported()) {
+            PreferenceCategory category = (PreferenceCategory) getPreferenceScreen().findPreference(KEY_VOLUME_CATEGORY);
+            category.removePreference(mVolumeBoost);
+            getPreferenceScreen().removePreference(category);
+        }
+
         mTvOut = new TvOut();
         mTvOutEnable = (CheckBoxPreference) findPreference(KEY_TVOUT_ENABLE);
         mTvOutEnable.setChecked(mTvOut._isEnabled());