summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/livedisplay
diff options
context:
space:
mode:
authorDan Elkouby <streetwalrus@codewalr.us>2016-03-05 14:08:04 +0200
committerSteve Kondik <shade@chemlab.org>2016-03-16 15:49:17 -0700
commit90095afc98b126f90368be529f02e10efcde8e99 (patch)
tree224541dc817d1a3414a82a30999ee389f39d6991 /src/com/android/settings/livedisplay
parent3a85ba8411921f76c334515180ea060768f007b2 (diff)
downloadpackages_apps_Settings-90095afc98b126f90368be529f02e10efcde8e99.zip
packages_apps_Settings-90095afc98b126f90368be529f02e10efcde8e99.tar.gz
packages_apps_Settings-90095afc98b126f90368be529f02e10efcde8e99.tar.bz2
DisplayColor: clamp maximum value to 1.0f
Sometimes when adjusting to 100%, this value can overflow causing the activity to crash. Change-Id: If578e98618ddae5d60924189feb3aafc6072d906
Diffstat (limited to 'src/com/android/settings/livedisplay')
-rw-r--r--src/com/android/settings/livedisplay/DisplayColor.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/livedisplay/DisplayColor.java b/src/com/android/settings/livedisplay/DisplayColor.java
index 010bed2..5db508f 100644
--- a/src/com/android/settings/livedisplay/DisplayColor.java
+++ b/src/com/android/settings/livedisplay/DisplayColor.java
@@ -267,7 +267,7 @@ public class DisplayColor extends DialogPreference {
IntervalSeekBar isb = (IntervalSeekBar)seekBar;
float fp = isb.getProgressFloat();
if (fromUser) {
- mCurrentColors[mIndex] = fp;
+ mCurrentColors[mIndex] = fp > 1.0f ? 1.0f : fp;
updateColors(mCurrentColors);
}