Settings: Map to CM Settings.

Change-Id: I2236b8b6b7cf1ad5e5db4ca1ec32d84351d2a08b

3 files changed, 11 insertions, 8 deletions

diff --git a/src/com/android/settings/notification/IncreasingRingVolumePreference.java b/src/com/android/settings/notification/IncreasingRingVolumePreference.java
index c08a369..2d706aa 100644
--- a/src/com/android/settings/notification/IncreasingRingVolumePreference.java
+++ b/src/com/android/settings/notification/IncreasingRingVolumePreference.java
@@ -35,6 +35,7 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 
 import com.android.settings.R;
+import cyanogenmod.providers.CMSettings;
 
 public class IncreasingRingVolumePreference extends Preference implements
         PreferenceManager.OnActivityStopListener, Handler.Callback,
@@ -122,10 +123,10 @@ public class IncreasingRingVolumePreference extends Preference implements
         mRampUpTimeValue = (TextView) view.findViewById(R.id.ramp_up_time_value);
 
         final ContentResolver cr = getContext().getContentResolver();
-        float startVolume = Settings.System.getFloat(cr,
-                Settings.System.INCREASING_RING_START_VOLUME, 0.1f);
-        int rampUpTime = Settings.System.getInt(cr,
-                Settings.System.INCREASING_RING_RAMP_UP_TIME, 10);
+        float startVolume = CMSettings.System.getFloat(cr,
+                CMSettings.System.INCREASING_RING_START_VOLUME, 0.1f);
+        int rampUpTime = CMSettings.System.getInt(cr,
+                CMSettings.System.INCREASING_RING_RAMP_UP_TIME, 10);
 
         mStartVolumeSeekBar.setProgress(Math.round(startVolume * 1000F));
         mStartVolumeSeekBar.setOnSeekBarChangeListener(this);
@@ -151,14 +152,14 @@ public class IncreasingRingVolumePreference extends Preference implements
     public void onProgressChanged(SeekBar seekBar, int progress, boolean fromTouch) {
         ContentResolver cr = getContext().getContentResolver();
         if (fromTouch && seekBar == mStartVolumeSeekBar) {
-            Settings.System.putFloat(cr, Settings.System.INCREASING_RING_START_VOLUME,
+            CMSettings.System.putFloat(cr, CMSettings.System.INCREASING_RING_START_VOLUME,
                         (float) progress / 1000F);
         } else if (seekBar == mRampUpTimeSeekBar) {
             int seconds = (progress + 1) * 5;
             mRampUpTimeValue.setText(
                     Formatter.formatShortElapsedTime(getContext(), seconds * 1000));
             if (fromTouch) {
-                Settings.System.putInt(cr, Settings.System.INCREASING_RING_RAMP_UP_TIME, seconds);
+                CMSettings.System.putInt(cr, CMSettings.System.INCREASING_RING_RAMP_UP_TIME, seconds);
             }
         }
     }
diff --git a/src/com/android/settings/notification/NotificationSettings.java b/src/com/android/settings/notification/NotificationSettings.java
index 34e60e8..df4305d 100644
--- a/src/com/android/settings/notification/NotificationSettings.java
+++ b/src/com/android/settings/notification/NotificationSettings.java
@@ -59,6 +59,7 @@ import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import cyanogenmod.providers.CMSettings;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -392,7 +393,7 @@ public class NotificationSettings extends SettingsPreferenceFragment implements
 
     private void initIncreasingRing(PreferenceCategory root) {
         mIncreasingRing = (TwoStatePreference)
-                root.findPreference(Settings.System.INCREASING_RING);
+                root.findPreference(CMSettings.System.INCREASING_RING);
         mIncreasingRingVolume = (IncreasingRingVolumePreference)
                 root.findPreference(KEY_INCREASING_RING_VOLUME);
 
diff --git a/src/com/android/settings/notification/OtherSoundSettings.java b/src/com/android/settings/notification/OtherSoundSettings.java
index fe76832..259b049 100644
--- a/src/com/android/settings/notification/OtherSoundSettings.java
+++ b/src/com/android/settings/notification/OtherSoundSettings.java
@@ -47,6 +47,7 @@ import com.android.settings.Utils;
 import com.android.settings.hardware.VibratorIntensity;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import cyanogenmod.providers.CMSettings;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -114,7 +115,7 @@ public class OtherSoundSettings extends SettingsPreferenceFragment implements In
     };
 
     private static final SettingPref PREF_VOLUME_ADJUST_SOUNDS = new SettingPref(
-            TYPE_SYSTEM, KEY_VOLUME_ADJUST_SOUNDS, System.VOLUME_ADJUST_SOUNDS_ENABLED,
+            TYPE_SYSTEM, KEY_VOLUME_ADJUST_SOUNDS, CMSettings.System.VOLUME_ADJUST_SOUNDS_ENABLED,
             DEFAULT_ON) {
         @Override
         public boolean isApplicable(Context context) {