am 0198d64d: Merge "Fix exposure compensation" into gb-ub-photos-bryce

* commit '0198d64d86ad05e72c2459ae1055f482d30b5305':
  Fix exposure compensation

diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 64f3681..7c7ed38 100644 (file)
--- 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];