diff options
| author | Michael Kolb <kolby@google.com> | 2013-03-14 22:09:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-14 22:09:16 +0000 |
| commit | 0198d64d86ad05e72c2459ae1055f482d30b5305 (patch) | |
| tree | a5f38c45f386f7c4fb10e618e34a5ab585f4f70c | |
| parent | 4a204853b57a6e855b0f4c2179d41bebce591ea7 (diff) | |
| parent | 293e9957b38df89b677f9eb70ddd73cae99cb184 (diff) | |
| download | android_packages_apps_Gallery2-0198d64d86ad05e72c2459ae1055f482d30b5305.tar.gz android_packages_apps_Gallery2-0198d64d86ad05e72c2459ae1055f482d30b5305.tar.bz2 android_packages_apps_Gallery2-0198d64d86ad05e72c2459ae1055f482d30b5305.zip | |
Merge "Fix exposure compensation" into gb-ub-photos-bryce
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 64f3681de..7c7ed389e 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -235,8 +235,8 @@ public class CameraSettings { private void buildExposureCompensation( PreferenceGroup group, IconListPreference exposure) { - int max = Math.min(3, mParameters.getMaxExposureCompensation()); - int min = Math.max(-3, mParameters.getMinExposureCompensation()); + int max = mParameters.getMaxExposureCompensation(); + int min = mParameters.getMinExposureCompensation(); if (max == 0 && min == 0) { removePreference(group, exposure.getKey()); return; @@ -244,8 +244,8 @@ public class CameraSettings { float step = mParameters.getExposureCompensationStep(); // show only integer values for exposure compensation - int maxValue = (int) FloatMath.floor(max * step); - int minValue = (int) FloatMath.ceil(min * step); + int maxValue = Math.min(3, (int) FloatMath.floor(max * step)); + int minValue = Math.max(-3, (int) FloatMath.ceil(min * step)); CharSequence entries[] = new CharSequence[maxValue - minValue + 1]; CharSequence entryValues[] = new CharSequence[maxValue - minValue + 1]; int[] icons = new int[maxValue - minValue + 1]; |