Settings: Move LiveDisplay settings and resources.

Change-Id: I356f7d8ce22bfd094a8aa17c73ee2cedb79f8db7

3 files changed, 36 insertions, 32 deletions

diff --git a/src/com/android/settings/livedisplay/DisplayColor.java b/src/com/android/settings/livedisplay/DisplayColor.java
index eb46abc..010bed2 100644
--- a/src/com/android/settings/livedisplay/DisplayColor.java
+++ b/src/com/android/settings/livedisplay/DisplayColor.java
@@ -37,6 +37,7 @@ import com.android.settings.IntervalSeekBar;
 import com.android.settings.R;
 
 import cyanogenmod.hardware.CMHardwareManager;
+import cyanogenmod.providers.CMSettings;
 
 /**
  * Special preference type that allows configuration of Color settings
@@ -104,8 +105,9 @@ public class DisplayColor extends DialogPreference {
     protected void onBindDialogView(View view) {
         super.onBindDialogView(view);
 
-        String colorAdjustmentTemp = Settings.System.getStringForUser(mContext.getContentResolver(),
-                Settings.System.DISPLAY_COLOR_ADJUSTMENT,
+        String colorAdjustmentTemp = CMSettings.System.getStringForUser(
+                mContext.getContentResolver(),
+                CMSettings.System.DISPLAY_COLOR_ADJUSTMENT,
                 UserHandle.USER_CURRENT);
         String[] colorAdjustment = colorAdjustmentTemp == null ?
                 null : colorAdjustmentTemp.split(" ");
@@ -239,8 +241,8 @@ public class DisplayColor extends DialogPreference {
     }
 
     private void updateColors(float[] colors) {
-        Settings.System.putStringForUser(mContext.getContentResolver(),
-                Settings.System.DISPLAY_COLOR_ADJUSTMENT,
+        CMSettings.System.putStringForUser(mContext.getContentResolver(),
+                CMSettings.System.DISPLAY_COLOR_ADJUSTMENT,
                 new StringBuilder().append(colors[0]).append(" ")
                                    .append(colors[1]).append(" ")
                                    .append(colors[2]).toString(),
diff --git a/src/com/android/settings/livedisplay/DisplayTemperature.java b/src/com/android/settings/livedisplay/DisplayTemperature.java
index eec1208..24ca747 100644
--- a/src/com/android/settings/livedisplay/DisplayTemperature.java
+++ b/src/com/android/settings/livedisplay/DisplayTemperature.java
@@ -32,6 +32,7 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 
 import com.android.settings.R;
+import cyanogenmod.providers.CMSettings;
 
 /**
  * Preference for selection of color temperature range for LiveDisplay
@@ -55,9 +56,9 @@ public class DisplayTemperature extends DialogPreference {
         mContext = context;
 
         mDefaultDayTemperature = mContext.getResources().getInteger(
-                com.android.internal.R.integer.config_dayColorTemperature);
+                org.cyanogenmod.platform.internal.R.integer.config_dayColorTemperature);
         mDefaultNightTemperature = mContext.getResources().getInteger(
-                com.android.internal.R.integer.config_nightColorTemperature);
+                org.cyanogenmod.platform.internal.R.integer.config_nightColorTemperature);
 
         setDialogLayoutResource(R.layout.display_temperature);
     }
@@ -76,12 +77,12 @@ public class DisplayTemperature extends DialogPreference {
     protected void onBindDialogView(View view) {
         super.onBindDialogView(view);
 
-        mOriginalDayTemperature = Settings.System.getIntForUser(mContext.getContentResolver(),
-                Settings.System.DISPLAY_TEMPERATURE_DAY,
+        mOriginalDayTemperature = CMSettings.System.getIntForUser(mContext.getContentResolver(),
+                CMSettings.System.DISPLAY_TEMPERATURE_DAY,
                 mDefaultDayTemperature,
                 UserHandle.USER_CURRENT);
-        mOriginalNightTemperature = Settings.System.getIntForUser(mContext.getContentResolver(),
-                Settings.System.DISPLAY_TEMPERATURE_NIGHT,
+        mOriginalNightTemperature = CMSettings.System.getIntForUser(mContext.getContentResolver(),
+                CMSettings.System.DISPLAY_TEMPERATURE_NIGHT,
                 mDefaultNightTemperature,
                 UserHandle.USER_CURRENT);
 
@@ -205,12 +206,12 @@ public class DisplayTemperature extends DialogPreference {
         int night = accept ? mNightTemperature.getProgress() : mOriginalNightTemperature;
         callChangeListener(new Integer[] { day, night });
 
-        Settings.System.putIntForUser(mContext.getContentResolver(),
-                Settings.System.DISPLAY_TEMPERATURE_DAY, day,
+        CMSettings.System.putIntForUser(mContext.getContentResolver(),
+                CMSettings.System.DISPLAY_TEMPERATURE_DAY, day,
                 UserHandle.USER_CURRENT);
 
-        Settings.System.putIntForUser(mContext.getContentResolver(),
-                Settings.System.DISPLAY_TEMPERATURE_NIGHT, night,
+        CMSettings.System.putIntForUser(mContext.getContentResolver(),
+                CMSettings.System.DISPLAY_TEMPERATURE_NIGHT, night,
                 UserHandle.USER_CURRENT);
     }
 
diff --git a/src/com/android/settings/livedisplay/LiveDisplay.java b/src/com/android/settings/livedisplay/LiveDisplay.java
index 71ff5a9..e364659 100644
--- a/src/com/android/settings/livedisplay/LiveDisplay.java
+++ b/src/com/android/settings/livedisplay/LiveDisplay.java
@@ -48,6 +48,7 @@ import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 
 import cyanogenmod.hardware.CMHardwareManager;
+import cyanogenmod.providers.CMSettings;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -105,9 +106,9 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
         final Resources res = getResources();
 
         mDefaultDayTemperature = res.getInteger(
-                com.android.internal.R.integer.config_dayColorTemperature);
+                org.cyanogenmod.platform.internal.R.integer.config_dayColorTemperature);
         mDefaultNightTemperature = res.getInteger(
-                com.android.internal.R.integer.config_nightColorTemperature);
+                org.cyanogenmod.platform.internal.R.integer.config_nightColorTemperature);
 
         mHardware = CMHardwareManager.getInstance(activity);
 
@@ -118,18 +119,18 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
         PreferenceCategory calibrationPrefs = (PreferenceCategory)
                 findPreference(KEY_CATEGORY_CALIBRATION);
 
-        int displayMode = Settings.System.getIntForUser(resolver,
-                Settings.System.DISPLAY_TEMPERATURE_MODE,
+        int displayMode = CMSettings.System.getIntForUser(resolver,
+                CMSettings.System.DISPLAY_TEMPERATURE_MODE,
                 0, UserHandle.USER_CURRENT);
         mLiveDisplay = (ListPreference) findPreference(KEY_LIVE_DISPLAY);
         mLiveDisplay.setValue(String.valueOf(displayMode));
 
         mModeEntries = res.getStringArray(
-                com.android.internal.R.array.live_display_entries);
+                org.cyanogenmod.platform.internal.R.array.live_display_entries);
         mModeValues = res.getStringArray(
-                com.android.internal.R.array.live_display_values);
+                org.cyanogenmod.platform.internal.R.array.live_display_values);
         mModeSummaries = res.getStringArray(
-                com.android.internal.R.array.live_display_summaries);
+                org.cyanogenmod.platform.internal.R.array.live_display_summaries);
 
         // Remove outdoor mode from lists if there is no support
         if (!mHardware.isSupported(FEATURE_SUNLIGHT_ENHANCEMENT)) {
@@ -221,8 +222,8 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
     }
 
     private void updateModeSummary() {
-        int mode = Settings.System.getIntForUser(getContentResolver(),
-                Settings.System.DISPLAY_TEMPERATURE_MODE,
+        int mode = CMSettings.System.getIntForUser(getContentResolver(),
+                CMSettings.System.DISPLAY_TEMPERATURE_MODE,
                 MODE_DAY, UserHandle.USER_CURRENT);
 
         int index = ArrayUtils.indexOf(mModeValues, String.valueOf(mode));
@@ -230,12 +231,12 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
     }
 
     private void updateTemperatureSummary() {
-        int day = Settings.System.getIntForUser(getContentResolver(),
-                Settings.System.DISPLAY_TEMPERATURE_DAY,
+        int day = CMSettings.System.getIntForUser(getContentResolver(),
+                CMSettings.System.DISPLAY_TEMPERATURE_DAY,
                 mDefaultDayTemperature,
                 UserHandle.USER_CURRENT);
-        int night = Settings.System.getIntForUser(getContentResolver(),
-                Settings.System.DISPLAY_TEMPERATURE_NIGHT,
+        int night = CMSettings.System.getIntForUser(getContentResolver(),
+                CMSettings.System.DISPLAY_TEMPERATURE_NIGHT,
                 mDefaultNightTemperature,
                 UserHandle.USER_CURRENT);
 
@@ -246,8 +247,8 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
     @Override
     public boolean onPreferenceChange(Preference preference, Object objValue) {
         if (preference == mLiveDisplay) {
-            Settings.System.putIntForUser(getContentResolver(),
-                    Settings.System.DISPLAY_TEMPERATURE_MODE,
+            CMSettings.System.putIntForUser(getContentResolver(),
+                    CMSettings.System.DISPLAY_TEMPERATURE_MODE,
                     Integer.valueOf((String)objValue), UserHandle.USER_CURRENT);
         }
         return true;
@@ -259,11 +260,11 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
 
     private final class SettingsObserver extends ContentObserver {
         private final Uri DISPLAY_TEMPERATURE_DAY_URI =
-                Settings.System.getUriFor(Settings.System.DISPLAY_TEMPERATURE_DAY);
+                CMSettings.System.getUriFor(CMSettings.System.DISPLAY_TEMPERATURE_DAY);
         private final Uri DISPLAY_TEMPERATURE_NIGHT_URI =
-                Settings.System.getUriFor(Settings.System.DISPLAY_TEMPERATURE_NIGHT);
+                CMSettings.System.getUriFor(CMSettings.System.DISPLAY_TEMPERATURE_NIGHT);
         private final Uri DISPLAY_TEMPERATURE_MODE_URI =
-                Settings.System.getUriFor(Settings.System.DISPLAY_TEMPERATURE_MODE);
+                CMSettings.System.getUriFor(CMSettings.System.DISPLAY_TEMPERATURE_MODE);
 
         public SettingsObserver() {
             super(mHandler);