summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/hardware
diff options
context:
space:
mode:
authorluca020400 <luca.stefani.ge1@gmail.com>2016-05-10 22:56:23 +0200
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-05-15 05:36:19 -0700
commita44bfb5a396056e22825f4989eee47b90b7bbc14 (patch)
tree0bdd1884460ad72a0f57e466fc122045cc0477cc /src/com/android/settings/hardware
parentaca99cc325b82be46caa4685e3fb2e0fa99bf38e (diff)
downloadpackages_apps_Settings-a44bfb5a396056e22825f4989eee47b90b7bbc14.zip
packages_apps_Settings-a44bfb5a396056e22825f4989eee47b90b7bbc14.tar.gz
packages_apps_Settings-a44bfb5a396056e22825f4989eee47b90b7bbc14.tar.bz2
Settings: Move vibrator value restore to onActivityStop
Change-Id: Ia35f1dcffd86c8c2717e68cd91537d652ecfa982
Diffstat (limited to 'src/com/android/settings/hardware')
-rw-r--r--src/com/android/settings/hardware/VibratorIntensity.java12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/com/android/settings/hardware/VibratorIntensity.java b/src/com/android/settings/hardware/VibratorIntensity.java
index c17c376..a778f36 100644
--- a/src/com/android/settings/hardware/VibratorIntensity.java
+++ b/src/com/android/settings/hardware/VibratorIntensity.java
@@ -42,7 +42,7 @@ import cyanogenmod.providers.CMSettings;
import com.android.settings.R;
public class VibratorIntensity extends DialogPreference implements
- SeekBar.OnSeekBarChangeListener {
+ SeekBar.OnSeekBarChangeListener, PreferenceManager.OnActivityStopListener {
private static final String PREF_NAME = "vibrator_intensity";
private SeekBar mSeekBar;
private TextView mValue;
@@ -122,6 +122,8 @@ public class VibratorIntensity extends DialogPreference implements
mSeekBar.setOnSeekBarChangeListener(this);
mSeekBar.setMax(mMaxValue - mMinValue);
mSeekBar.setProgress(mOriginalValue - mMinValue);
+
+ getPreferenceManager().registerOnActivityStopListener(this);
}
@Override
@@ -156,6 +158,13 @@ public class VibratorIntensity extends DialogPreference implements
CMSettings.Secure.putInt(getContext().getContentResolver(),
CMSettings.Secure.VIBRATOR_INTENSITY, mOriginalValue);
}
+
+ getPreferenceManager().unregisterOnActivityStopListener(this);
+ }
+
+ @Override
+ public void onActivityStop() {
+ mHardware.setVibratorIntensity(mOriginalValue);
}
public static void restore(Context context) {
@@ -198,7 +207,6 @@ public class VibratorIntensity extends DialogPreference implements
mHardware.setVibratorIntensity(seekBar.getProgress() + mMinValue);
Vibrator vib = (Vibrator) getContext().getSystemService(Context.VIBRATOR_SERVICE);
vib.vibrate(200);
- mHardware.setVibratorIntensity(mOriginalValue);
}
private static int intensityToPercent(int minValue, int maxValue, int value) {