summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2015-03-09 11:12:04 +0100
committerGerrit Code Review <gerrit@cyanogenmod.org>2015-11-01 14:40:32 -0800
commitf01220e5335880f852fe87234ca69a03bae0931a (patch)
treeb892b8ce26d2b30949378e42ed2e8b349f44902c
parent93a640d713c68b674894ae290abedafacb0db9cf (diff)
downloadpackages_apps_Settings-f01220e5335880f852fe87234ca69a03bae0931a.zip
packages_apps_Settings-f01220e5335880f852fe87234ca69a03bae0931a.tar.gz
packages_apps_Settings-f01220e5335880f852fe87234ca69a03bae0931a.tar.bz2
Use 100K steps for color temperature sliders.
Change-Id: I63f72eac68dd1a7bafd7ab462b09db7f0c07f2a3
-rw-r--r--src/com/android/settings/livedisplay/DisplayTemperature.java11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/com/android/settings/livedisplay/DisplayTemperature.java b/src/com/android/settings/livedisplay/DisplayTemperature.java
index 971bd3e..eec1208 100644
--- a/src/com/android/settings/livedisplay/DisplayTemperature.java
+++ b/src/com/android/settings/livedisplay/DisplayTemperature.java
@@ -220,12 +220,13 @@ public class DisplayTemperature extends DialogPreference {
private static final int MIN = 1000;
private static final int MAX = 10000;
+ private static final int STEP = 100;
public ColorTemperatureSeekBar(SeekBar seekBar, TextView value) {
mSeekBar = seekBar;
mValue = value;
- mSeekBar.setMax(MAX - MIN);
+ mSeekBar.setMax((MAX - MIN) / STEP);
mSeekBar.setOnSeekBarChangeListener(this);
}
@@ -235,16 +236,16 @@ public class DisplayTemperature extends DialogPreference {
updateTemperature(true);
}
mValue.setText(mContext.getResources().getString(
- R.string.live_display_color_temperature_label, progress + MIN));
+ R.string.live_display_color_temperature_label, progress * STEP + MIN));
}
public void setProgress(int progress) {
- int p = progress < MIN ? MIN : progress;
- mSeekBar.setProgress(p - MIN);
+ int p = Math.max(progress, MIN) - MIN;
+ mSeekBar.setProgress(Math.round((float) p / STEP));
}
public int getProgress() {
- return mSeekBar.getProgress() + MIN;
+ return mSeekBar.getProgress() * STEP + MIN;
}
@Override