Settings: Map to CM Settings.

Change-Id: I2236b8b6b7cf1ad5e5db4ca1ec32d84351d2a08b

6 files changed, 47 insertions, 41 deletions

diff --git a/src/com/android/settings/ButtonSettings.java b/src/com/android/settings/ButtonSettings.java
index 45973e2..b1c9644 100644
--- a/src/com/android/settings/ButtonSettings.java
+++ b/src/com/android/settings/ButtonSettings.java
@@ -48,6 +48,7 @@ import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
 import com.android.settings.cyanogenmod.ButtonBacklightBrightness;
 
+import cyanogenmod.providers.CMSettings;
 import org.cyanogenmod.hardware.KeyDisabler;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
@@ -345,6 +346,11 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
             prefScreen.removePreference(appSwitchCategory);
         }
 
+        mCameraWakeScreen = (SwitchPreference) findPreference(Settings.System.CAMERA_WAKE_SCREEN);
+        mCameraSleepOnRelease =
+                (SwitchPreference) findPreference(Settings.System.CAMERA_SLEEP_ON_RELEASE);
+        mCameraLaunch = (SwitchPreference) findPreference(Settings.System.CAMERA_LAUNCH);
+
         if (hasCameraKey) {
             if (!showCameraWake) {
                 prefScreen.removePreference(mCameraWakeScreen);
@@ -406,24 +412,19 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
         Utils.updatePreferenceToSpecificActivityFromMetaDataOrRemove(getActivity(),
                 getPreferenceScreen(), KEY_BLUETOOTH_INPUT_SETTINGS);
 
-            mCameraWakeScreen = (SwitchPreference) findPreference(Settings.System.CAMERA_WAKE_SCREEN);
-            mCameraSleepOnRelease =
-                    (SwitchPreference) findPreference(Settings.System.CAMERA_SLEEP_ON_RELEASE);
-            mCameraLaunch = (SwitchPreference) findPreference(Settings.System.CAMERA_LAUNCH);
-
-            if (mCameraWakeScreen != null) {
-                if (mCameraSleepOnRelease != null && !getResources().getBoolean(
-                        com.android.internal.R.bool.config_singleStageCameraKey)) {
-                    mCameraSleepOnRelease.setDependency(Settings.System.CAMERA_WAKE_SCREEN);
-                }
+        if (mCameraWakeScreen != null) {
+            if (mCameraSleepOnRelease != null && !getResources().getBoolean(
+                    com.android.internal.R.bool.config_singleStageCameraKey)) {
+                mCameraSleepOnRelease.setDependency(Settings.System.CAMERA_WAKE_SCREEN);
             }
+        }
         mVolumeWakeScreen = (SwitchPreference) findPreference(Settings.System.VOLUME_WAKE_SCREEN);
         mVolumeMusicControls = (SwitchPreference) findPreference(KEY_VOLUME_MUSIC_CONTROLS);
 
         mVolumeControlRingStream = (SwitchPreference)
                 findPreference(KEY_VOLUME_CONTROL_RING_STREAM);
-        int volumeControlRingtone = Settings.System.getInt(getContentResolver(),
-                Settings.System.VOLUME_KEYS_CONTROL_RING_STREAM, 1);
+        int volumeControlRingtone = CMSettings.System.getInt(getContentResolver(),
+                CMSettings.System.VOLUME_KEYS_CONTROL_RING_STREAM, 1);
         if (mVolumeControlRingStream != null) {
             mVolumeControlRingStream.setChecked(volumeControlRingtone > 0);
         }
@@ -452,11 +453,11 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
 
         // Home button answers calls.
         if (mHomeAnswerCall != null) {
-            final int incallHomeBehavior = Settings.Secure.getInt(getContentResolver(),
-                    Settings.Secure.RING_HOME_BUTTON_BEHAVIOR,
-                    Settings.Secure.RING_HOME_BUTTON_BEHAVIOR_DEFAULT);
+            final int incallHomeBehavior = CMSettings.Secure.getInt(getContentResolver(),
+                    CMSettings.Secure.RING_HOME_BUTTON_BEHAVIOR,
+                    CMSettings.Secure.RING_HOME_BUTTON_BEHAVIOR_DEFAULT);
             final boolean homeButtonAnswersCall =
-                (incallHomeBehavior == Settings.Secure.RING_HOME_BUTTON_BEHAVIOR_ANSWER);
+                (incallHomeBehavior == CMSettings.Secure.RING_HOME_BUTTON_BEHAVIOR_ANSWER);
             mHomeAnswerCall.setChecked(homeButtonAnswersCall);
         }
 
@@ -475,8 +476,8 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
         list.setOnPreferenceChangeListener(this);
 
         // Read the componentName from Settings.Secure, this is the user's prefered setting
-        String componentString = Settings.Secure.getString(getContentResolver(),
-                Settings.Secure.RECENTS_LONG_PRESS_ACTIVITY);
+        String componentString = CMSettings.Secure.getString(getContentResolver(),
+                CMSettings.Secure.RECENTS_LONG_PRESS_ACTIVITY);
         ComponentName targetComponent = null;
         if (componentString == null) {
             list.setSummary(getString(R.string.hardware_keys_action_last_app));
@@ -487,14 +488,14 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
         // Dyanamically generate the list array,
         // query PackageManager for all Activites that are registered for ACTION_RECENTS_LONG_PRESS
         PackageManager pm = getPackageManager();
-        Intent intent = new Intent(Intent.ACTION_RECENTS_LONG_PRESS);
+        Intent intent = new Intent(cyanogenmod.content.Intent.ACTION_RECENTS_LONG_PRESS);
         List<ResolveInfo> recentsActivities = pm.queryIntentActivities(intent,
                 PackageManager.MATCH_DEFAULT_ONLY);
         if (recentsActivities.size() == 0) {
             // No entries available, disable
             list.setSummary(getString(R.string.hardware_keys_action_last_app));
-            Settings.Secure.putString(getContentResolver(),
-                    Settings.Secure.RECENTS_LONG_PRESS_ACTIVITY, null);
+            CMSettings.Secure.putString(getContentResolver(),
+                    CMSettings.Secure.RECENTS_LONG_PRESS_ACTIVITY, null);
             list.setEnabled(false);
             return list;
         }
@@ -596,8 +597,8 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
             if (putString.length() == 0) {
                 putString = null;
             }
-            Settings.Secure.putString(getContentResolver(),
-                    Settings.Secure.RECENTS_LONG_PRESS_ACTIVITY, putString);
+            CMSettings.Secure.putString(getContentResolver(),
+                    CMSettings.Secure.RECENTS_LONG_PRESS_ACTIVITY, putString);
             return true;
         }
         return false;
@@ -694,8 +695,8 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
                     Settings.System.SWAP_VOLUME_KEYS_ON_ROTATION, value);
         } else if (preference == mVolumeControlRingStream) {
             int value = mVolumeControlRingStream.isChecked() ? 1 : 0;
-            Settings.System.putInt(getActivity().getContentResolver(),
-                    Settings.System.VOLUME_KEYS_CONTROL_RING_STREAM, value);
+            CMSettings.System.putInt(getActivity().getContentResolver(),
+                    CMSettings.System.VOLUME_KEYS_CONTROL_RING_STREAM, value);
         } else if (preference == mDisableNavigationKeys) {
             mDisableNavigationKeys.setEnabled(false);
             mNavigationPreferencesCat.setEnabled(false);
@@ -729,9 +730,9 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
     }
 
     private void handleToggleHomeButtonAnswersCallPreferenceClick() {
-        Settings.Secure.putInt(getContentResolver(),
-                Settings.Secure.RING_HOME_BUTTON_BEHAVIOR, (mHomeAnswerCall.isChecked()
-                        ? Settings.Secure.RING_HOME_BUTTON_BEHAVIOR_ANSWER
-                        : Settings.Secure.RING_HOME_BUTTON_BEHAVIOR_DO_NOTHING));
+        CMSettings.Secure.putInt(getContentResolver(),
+                CMSettings.Secure.RING_HOME_BUTTON_BEHAVIOR, (mHomeAnswerCall.isChecked()
+                        ? CMSettings.Secure.RING_HOME_BUTTON_BEHAVIOR_ANSWER
+                        : CMSettings.Secure.RING_HOME_BUTTON_BEHAVIOR_DO_NOTHING));
     }
 }
diff --git a/src/com/android/settings/cyanogenmod/NavBar.java b/src/com/android/settings/cyanogenmod/NavBar.java
index ecd669f..a4ea5e7 100644
--- a/src/com/android/settings/cyanogenmod/NavBar.java
+++ b/src/com/android/settings/cyanogenmod/NavBar.java
@@ -30,6 +30,7 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import com.android.settings.R;
 import com.android.settings.Utils;
+import cyanogenmod.providers.CMSettings;
 
 public class NavBar extends Fragment implements View.OnClickListener {
 
@@ -90,8 +91,8 @@ public class NavBar extends Fragment implements View.OnClickListener {
                             if (mEditMode) {
                                 toggleEditMode(false, false);
                             }
-                            Settings.System.putString(getActivity().getContentResolver(),
-                                    Settings.System.NAV_BUTTONS, null);
+                            CMSettings.System.putString(getActivity().getContentResolver(),
+                                    CMSettings.System.NAV_BUTTONS, null);
                             toggleEditMode(true, false);
                             toggleEditMode(false, false);
                             mEditMode = false;
diff --git a/src/com/android/settings/cyanogenmod/NavRing.java b/src/com/android/settings/cyanogenmod/NavRing.java
index 9c3a96d..2541277 100644
--- a/src/com/android/settings/cyanogenmod/NavRing.java
+++ b/src/com/android/settings/cyanogenmod/NavRing.java
@@ -30,6 +30,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.android.settings.R;
+import cyanogenmod.providers.CMSettings;
 
 public class NavRing extends Fragment implements View.OnClickListener {
     private LinearLayout mRestore, mSave, mEdit;
@@ -66,8 +67,8 @@ public class NavRing extends Fragment implements View.OnClickListener {
                     .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int id) {
                             for (int i = 0; i < 3; i++) {
-                                Settings.Secure.putString(getActivity().getContentResolver(),
-                                        Settings.Secure.NAVIGATION_RING_TARGETS[i], null);
+                                CMSettings.Secure.putString(getActivity().getContentResolver(),
+                                        CMSettings.Secure.NAVIGATION_RING_TARGETS[i], null);
                             }
                         }
                     })
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) {