settings: Move CMHW to CMSDK

 * Update all references and API usage.

Change-Id: If6bda2547bdd251ccf9a04ad0deac7f2fd51fa29

3 files changed, 46 insertions, 46 deletions

diff --git a/src/com/android/settings/livedisplay/DisplayColor.java b/src/com/android/settings/livedisplay/DisplayColor.java
index d6b7b37..eb46abc 100644
--- a/src/com/android/settings/livedisplay/DisplayColor.java
+++ b/src/com/android/settings/livedisplay/DisplayColor.java
@@ -16,10 +16,11 @@
 
 package com.android.settings.livedisplay;
 
+import static cyanogenmod.hardware.CMHardwareManager.FEATURE_DISPLAY_COLOR_CALIBRATION;
+
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.hardware.CmHardwareManager;
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -35,7 +36,7 @@ import android.widget.TextView;
 import com.android.settings.IntervalSeekBar;
 import com.android.settings.R;
 
-import static android.hardware.CmHardwareManager.FEATURE_DISPLAY_COLOR_CALIBRATION;
+import cyanogenmod.hardware.CMHardwareManager;
 
 /**
  * Special preference type that allows configuration of Color settings
@@ -73,13 +74,12 @@ public class DisplayColor extends DialogPreference {
 
         mContext = context;
 
-        final CmHardwareManager mCmHardwareManager =
-                (CmHardwareManager) mContext.getSystemService(Context.CMHW_SERVICE);
-        useCMHW = mCmHardwareManager.isSupported(FEATURE_DISPLAY_COLOR_CALIBRATION);
+        final CMHardwareManager mHardware = CMHardwareManager.getInstance(context);
+        useCMHW = mHardware.isSupported(FEATURE_DISPLAY_COLOR_CALIBRATION);
         if (useCMHW) {
-            minRGB = mCmHardwareManager.getDisplayColorCalibrationMin();
-            maxRGB = mCmHardwareManager.getDisplayColorCalibrationMax();
-            defaultRGB = (float) mCmHardwareManager.getDisplayColorCalibrationDefault() / maxRGB;
+            minRGB = mHardware.getDisplayColorCalibrationMin();
+            maxRGB = mHardware.getDisplayColorCalibrationMax();
+            defaultRGB = (float) mHardware.getDisplayColorCalibrationDefault() / maxRGB;
         } else {
             // Initialize these just to avoid compiler errors.
             minRGB = 20;
diff --git a/src/com/android/settings/livedisplay/DisplayGamma.java b/src/com/android/settings/livedisplay/DisplayGamma.java
index c9e5697..e75e3a4 100644
--- a/src/com/android/settings/livedisplay/DisplayGamma.java
+++ b/src/com/android/settings/livedisplay/DisplayGamma.java
@@ -22,7 +22,6 @@ import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.content.res.Resources;
-import android.hardware.CmHardwareManager;
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -39,6 +38,8 @@ import android.widget.TextView;
 
 import com.android.settings.R;
 
+import cyanogenmod.hardware.CMHardwareManager;
+
 import java.util.Arrays;
 
 /**
@@ -58,17 +59,17 @@ public class DisplayGamma extends DialogPreference {
     private int[][] mCurrentColors;
     private int[][] mOriginalColors;
     private int mNumberOfControls;
-    private CmHardwareManager mCmHardwareManager;
+    private CMHardwareManager mHardware;
 
     public DisplayGamma(Context context, AttributeSet attrs) {
         super(context, attrs);
 
-        mCmHardwareManager = (CmHardwareManager) context.getSystemService(Context.CMHW_SERVICE);
-        if (!mCmHardwareManager.isSupported(CmHardwareManager.FEATURE_DISPLAY_GAMMA_CALIBRATION)) {
+        mHardware = CMHardwareManager.getInstance(context);
+        if (!mHardware.isSupported(CMHardwareManager.FEATURE_DISPLAY_GAMMA_CALIBRATION)) {
             return;
         }
 
-        mNumberOfControls = mCmHardwareManager.getNumGammaControls();
+        mNumberOfControls = mHardware.getNumGammaControls();
         mSeekBars = new GammaSeekBar[mNumberOfControls][BAR_COLORS.length];
 
         mOriginalColors = new int[mNumberOfControls][];
@@ -100,7 +101,7 @@ public class DisplayGamma extends DialogPreference {
         // Create multiple sets of seekbars, depending on the
         // number of controls the device has
         for (int index = 0; index < mNumberOfControls; index++) {
-            mOriginalColors[index] = mCmHardwareManager.getDisplayGammaCalibration(index);
+            mOriginalColors[index] = mHardware.getDisplayGammaCalibration(index);
             mCurrentColors[index] = Arrays.copyOf(mOriginalColors[index],
                     mOriginalColors[index].length);
 
@@ -124,8 +125,8 @@ public class DisplayGamma extends DialogPreference {
                 container.addView(header);
             }
 
-            int min = mCmHardwareManager.getDisplayGammaCalibrationMin();
-            int max = mCmHardwareManager.getDisplayGammaCalibrationMax();
+            int min = mHardware.getDisplayGammaCalibrationMin();
+            int max = mHardware.getDisplayGammaCalibrationMax();
             for (int color = 0; color < BAR_COLORS.length; color++) {
                 ViewGroup item = (ViewGroup) inflater.inflate(
                         R.layout.display_gamma_calibration_item, container, false);
@@ -164,7 +165,7 @@ public class DisplayGamma extends DialogPreference {
                         mSeekBars[index][color].setGamma(val);
                         mCurrentColors[index][color] = val;
                     }
-                    mCmHardwareManager.setDisplayGammaCalibration(index, mCurrentColors[index]);
+                    mHardware.setDisplayGammaCalibration(index, mCurrentColors[index]);
                 }
             }
        });
@@ -178,12 +179,12 @@ public class DisplayGamma extends DialogPreference {
             Editor editor = getEditor();
             for (int i = 0; i < mNumberOfControls; i++) {
                 editor.putString("display_gamma_" + i,
-                        buildPreferenceValue(mCmHardwareManager.getDisplayGammaCalibration(i)));
+                        buildPreferenceValue(mHardware.getDisplayGammaCalibration(i)));
             }
             editor.apply();
         } else if (mOriginalColors != null) {
             for (int i = 0; i < mNumberOfControls; i++) {
-                mCmHardwareManager.setDisplayGammaCalibration(i, mOriginalColors[i]);
+                mHardware.setDisplayGammaCalibration(i, mOriginalColors[i]);
             }
         }
     }
@@ -203,7 +204,7 @@ public class DisplayGamma extends DialogPreference {
 
         // Restore the old state when the activity or dialog is being paused
         for (int i = 0; i < mNumberOfControls; i++) {
-            mCmHardwareManager.setDisplayGammaCalibration(i, mOriginalColors[i]);
+            mHardware.setDisplayGammaCalibration(i, mOriginalColors[i]);
         }
         mOriginalColors = null;
 
@@ -228,7 +229,7 @@ public class DisplayGamma extends DialogPreference {
             for (int color = 0; color < BAR_COLORS.length; color++) {
                 mSeekBars[index][color].setGamma(mCurrentColors[index][color]);
             }
-            mCmHardwareManager.setDisplayGammaCalibration(index, mCurrentColors[index]);
+            mHardware.setDisplayGammaCalibration(index, mCurrentColors[index]);
         }
     }
 
@@ -244,22 +245,21 @@ public class DisplayGamma extends DialogPreference {
     }
 
     public static void restore(Context context) {
-        final CmHardwareManager cmHardwareManager =
-                (CmHardwareManager) context.getSystemService(Context.CMHW_SERVICE);
-        if (!cmHardwareManager.isSupported(CmHardwareManager.FEATURE_DISPLAY_GAMMA_CALIBRATION)) {
+        final CMHardwareManager hardware = CMHardwareManager.getInstance(context);
+        if (!hardware.isSupported(CMHardwareManager.FEATURE_DISPLAY_GAMMA_CALIBRATION)) {
             return;
         }
 
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         int[] rgb = new int[3];
-        for (int i = 0; i < cmHardwareManager.getNumGammaControls(); i++) {
+        for (int i = 0; i < hardware.getNumGammaControls(); i++) {
             final String value = prefs.getString("display_gamma_" + i, null);
             if (value != null) {
                 final String[] values = value.split(" ");
                 rgb[0] = Integer.valueOf(values[0]);
                 rgb[1] = Integer.valueOf(values[1]);
                 rgb[2] = Integer.valueOf(values[2]);
-                cmHardwareManager.setDisplayGammaCalibration(i, rgb);
+                hardware.setDisplayGammaCalibration(i, rgb);
             }
         }
     }
@@ -350,7 +350,7 @@ public class DisplayGamma extends DialogPreference {
         public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
             if (fromUser) {
                 mCurrentColors[mControlIndex][mColorIndex] = progress + mMin;
-                mCmHardwareManager.setDisplayGammaCalibration(mControlIndex,
+                mHardware.setDisplayGammaCalibration(mControlIndex,
                         mCurrentColors[mControlIndex]);
             }
             mValue.setText(String.valueOf(progress + mMin));
diff --git a/src/com/android/settings/livedisplay/LiveDisplay.java b/src/com/android/settings/livedisplay/LiveDisplay.java
index 8a9e9a0..dd20f0e 100644
--- a/src/com/android/settings/livedisplay/LiveDisplay.java
+++ b/src/com/android/settings/livedisplay/LiveDisplay.java
@@ -15,13 +15,17 @@
  */
 package com.android.settings.livedisplay;
 
+import static cyanogenmod.hardware.CMHardwareManager.FEATURE_ADAPTIVE_BACKLIGHT;
+import static cyanogenmod.hardware.CMHardwareManager.FEATURE_COLOR_ENHANCEMENT;
+import static cyanogenmod.hardware.CMHardwareManager.FEATURE_DISPLAY_GAMMA_CALIBRATION;
+import static cyanogenmod.hardware.CMHardwareManager.FEATURE_SUNLIGHT_ENHANCEMENT;
+
 import android.app.Activity;
 import android.database.ContentObserver;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.res.Resources;
 import android.database.ContentObserver;
-import android.hardware.CmHardwareManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -35,11 +39,6 @@ import android.preference.SwitchPreference;
 import android.provider.SearchIndexableResource;
 import android.provider.Settings;
 
-import static android.hardware.CmHardwareManager.FEATURE_ADAPTIVE_BACKLIGHT;
-import static android.hardware.CmHardwareManager.FEATURE_COLOR_ENHANCEMENT;
-import static android.hardware.CmHardwareManager.FEATURE_DISPLAY_GAMMA_CALIBRATION;
-import static android.hardware.CmHardwareManager.FEATURE_SUNLIGHT_ENHANCEMENT;
-
 import com.android.internal.util.ArrayUtils;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
@@ -47,6 +46,8 @@ import com.android.settings.Utils;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 
+import cyanogenmod.hardware.CMHardwareManager;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -93,7 +94,7 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
     private int mDefaultDayTemperature;
     private int mDefaultNightTemperature;
 
-    private CmHardwareManager mCmHardwareManager;
+    private CMHardwareManager mHardware;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -107,7 +108,7 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
         mDefaultNightTemperature = res.getInteger(
                 com.android.internal.R.integer.config_nightColorTemperature);
 
-        mCmHardwareManager = (CmHardwareManager) activity.getSystemService(Context.CMHW_SERVICE);
+        mHardware = CMHardwareManager.getInstance(activity);
 
         addPreferencesFromResource(R.xml.livedisplay);
 
@@ -130,7 +131,7 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
                 com.android.internal.R.array.live_display_summaries);
 
         // Remove outdoor mode from lists if there is no support
-        if (!mCmHardwareManager.isSupported(FEATURE_SUNLIGHT_ENHANCEMENT)) {
+        if (!mHardware.isSupported(FEATURE_SUNLIGHT_ENHANCEMENT)) {
             int idx = ArrayUtils.indexOf(mModeValues, String.valueOf(MODE_OUTDOOR));
             String[] entriesTemp = new String[mModeEntries.length - 1];
             String[] valuesTemp = new String[mModeValues.length - 1];
@@ -158,27 +159,27 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
 
         mLowPower = (SwitchPreference) findPreference(KEY_LIVE_DISPLAY_LOW_POWER);
         if (liveDisplayPrefs != null && mLowPower != null
-                && !mCmHardwareManager.isSupported(FEATURE_ADAPTIVE_BACKLIGHT)) {
+                && !mHardware.isSupported(FEATURE_ADAPTIVE_BACKLIGHT)) {
             liveDisplayPrefs.removePreference(mLowPower);
             mLowPower = null;
         }
 
         mOutdoorMode = (SwitchPreference) findPreference(KEY_LIVE_DISPLAY_AUTO_OUTDOOR_MODE);
         if (liveDisplayPrefs != null && mOutdoorMode != null
-                && !mCmHardwareManager.isSupported(FEATURE_SUNLIGHT_ENHANCEMENT)) {
+                && !mHardware.isSupported(FEATURE_SUNLIGHT_ENHANCEMENT)) {
             liveDisplayPrefs.removePreference(mOutdoorMode);
             mOutdoorMode = null;
         }
 
         mColorEnhancement = (SwitchPreference) findPreference(KEY_LIVE_DISPLAY_COLOR_ENHANCE);
         if (liveDisplayPrefs != null && mColorEnhancement != null
-                && !mCmHardwareManager.isSupported(FEATURE_COLOR_ENHANCEMENT)) {
+                && !mHardware.isSupported(FEATURE_COLOR_ENHANCEMENT)) {
             liveDisplayPrefs.removePreference(mColorEnhancement);
             mColorEnhancement = null;
         }
 
         if (calibrationPrefs != null
-                && !mCmHardwareManager.isSupported(FEATURE_DISPLAY_GAMMA_CALIBRATION)) {
+                && !mHardware.isSupported(FEATURE_DISPLAY_GAMMA_CALIBRATION)) {
             Preference gammaPref = findPreference(KEY_DISPLAY_GAMMA);
             if (gammaPref != null) {
                 calibrationPrefs.removePreference(gammaPref);
@@ -301,17 +302,16 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
 
         @Override
         public List<String> getNonIndexableKeys(Context context) {
-             CmHardwareManager cmHardwareManager =
-                    (CmHardwareManager) context.getSystemService(Context.CMHW_SERVICE);
+             CMHardwareManager hardware = CMHardwareManager.getInstance(context);
 
             ArrayList<String> result = new ArrayList<String>();
-            if (!cmHardwareManager.isSupported(FEATURE_SUNLIGHT_ENHANCEMENT)) {
+            if (!hardware.isSupported(FEATURE_SUNLIGHT_ENHANCEMENT)) {
                 result.add(KEY_LIVE_DISPLAY_AUTO_OUTDOOR_MODE);
             }
-            if (!cmHardwareManager.isSupported(FEATURE_COLOR_ENHANCEMENT)) {
+            if (!hardware.isSupported(FEATURE_COLOR_ENHANCEMENT)) {
                 result.add(KEY_LIVE_DISPLAY_COLOR_ENHANCE);
             }
-            if (!cmHardwareManager.isSupported(FEATURE_ADAPTIVE_BACKLIGHT)) {
+            if (!hardware.isSupported(FEATURE_ADAPTIVE_BACKLIGHT)) {
                 result.add(KEY_LIVE_DISPLAY_LOW_POWER);
             }
             if (!isPostProcessingSupported(context)) {
@@ -319,7 +319,7 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
             } else {
                 result.add(KEY_DISPLAY_COLOR);
             }
-            if (!cmHardwareManager.isSupported(FEATURE_DISPLAY_GAMMA_CALIBRATION)) {
+            if (!hardware.isSupported(FEATURE_DISPLAY_GAMMA_CALIBRATION)) {
                 result.add(KEY_DISPLAY_GAMMA);
             }
             return result;