Settings : Add multiuser support for CMHardware

- Show button for other users
- Use services instead of CMHardware for vibrator and touch sensitivity
- Do a one time restore of tunable settings

CYNGNOS-1166

Change-Id: I0de8eef6bf73c344ee5789e9650dd96b25b1a6bc

1 files changed, 12 insertions, 11 deletions

diff --git a/src/com/android/settings/hardware/VibratorIntensity.java b/src/com/android/settings/hardware/VibratorIntensity.java
index 8bb39ca..e847933 100644
--- a/src/com/android/settings/hardware/VibratorIntensity.java
+++ b/src/com/android/settings/hardware/VibratorIntensity.java
@@ -37,6 +37,7 @@ import android.widget.TextView;
 import android.widget.Button;
 
 import cyanogenmod.hardware.CMHardwareManager;
+import cyanogenmod.providers.CMSettings;
 
 import com.android.settings.R;
 
@@ -52,6 +53,7 @@ public class VibratorIntensity extends DialogPreference implements
     private int mDefaultValue;
     private int mWarningValue;
     private CMHardwareManager mHardware;
+    private final Vibrator mVibrator;
 
     private Drawable mProgressDrawable;
     private Drawable mProgressThumb;
@@ -61,6 +63,7 @@ public class VibratorIntensity extends DialogPreference implements
         super(context, attrs);
 
         mHardware = CMHardwareManager.getInstance(context);
+        mVibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
 
         if (!mHardware.isSupported(CMHardwareManager.FEATURE_VIBRATOR)) {
             return;
@@ -116,13 +119,8 @@ public class VibratorIntensity extends DialogPreference implements
         mRedFilter = new LightingColorFilter(Color.BLACK,
                 getContext().getResources().getColor(android.R.color.holo_red_light));
 
-        // Restore percent value from SharedPreferences object
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
-        int defaultValue = intensityToPercent(mMinValue, mMaxValue, mDefaultValue);
-        int percent = prefs.getInt(PREF_NAME, defaultValue);
-
         mSeekBar.setOnSeekBarChangeListener(this);
-        mSeekBar.setProgress(percent);
+        mSeekBar.setProgress(intensityToPercent(mMinValue, mMaxValue, mOriginalValue));
     }
 
     @Override
@@ -150,7 +148,8 @@ public class VibratorIntensity extends DialogPreference implements
             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
             prefs.edit().putInt(PREF_NAME, mSeekBar.getProgress()).commit();
         } else {
-            mHardware.setVibratorIntensity(mHardware.getVibratorIntensity());
+            CMSettings.Secure.putInt(getContext().getContentResolver(),
+                    CMSettings.Secure.VIBRATOR_INTENSITY, mOriginalValue);
         }
     }
 
@@ -160,14 +159,15 @@ public class VibratorIntensity extends DialogPreference implements
             return;
         }
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        int vibrator = hardware.getVibratorIntensity();
         int min = hardware.getVibratorMinIntensity();
         int max = hardware.getVibratorMaxIntensity();
         int defaultValue = intensityToPercent(min, max,
                 hardware.getVibratorDefaultIntensity());
         int percent = prefs.getInt(PREF_NAME, defaultValue);
 
-        hardware.setVibratorIntensity(percentToIntensity(min, max, percent));
+        CMSettings.Secure.putInt(context.getContentResolver(),
+                CMSettings.Secure.VIBRATOR_INTENSITY, percentToIntensity(min, max,
+                        percentToIntensity(min, max, percent)));
     }
 
     @Override
@@ -183,8 +183,9 @@ public class VibratorIntensity extends DialogPreference implements
             mProgressThumb.setColorFilter(shouldWarn ? mRedFilter : null);
         }
 
-        mHardware.setVibratorIntensity(percentToIntensity(mMinValue, mMaxValue,
-                progress));
+        CMSettings.Secure.putInt(getContext().getContentResolver(),
+                CMSettings.Secure.VIBRATOR_INTENSITY, percentToIntensity(mMinValue, mMaxValue,
+                        progress));
         mValue.setText(String.format("%d%%", progress));
     }