diff options
| author | Michael Kolb <kolby@google.com> | 2013-03-13 21:00:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-13 21:03:37 +0000 |
| commit | d52594cf7993e156491a806ade65b6f85e639b20 (patch) | |
| tree | 7f64a16b7d3198771937e7d31b5719a41bf707fe | |
| parent | 4563676bbf9d32a3dce180123bca7adc6940809e (diff) | |
| parent | 40abb46e3b7f9d3ec0a354fa38e1150752656e33 (diff) | |
| download | android_packages_apps_Gallery2-d52594cf7993e156491a806ade65b6f85e639b20.tar.gz android_packages_apps_Gallery2-d52594cf7993e156491a806ade65b6f85e639b20.tar.bz2 android_packages_apps_Gallery2-d52594cf7993e156491a806ade65b6f85e639b20.zip | |
Merge "Fix bug in exposure setting" into gb-ub-photos-bryce
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 31d31e128..64f3681de 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 = mParameters.getMaxExposureCompensation(); - int min = mParameters.getMinExposureCompensation(); + int max = Math.min(3, mParameters.getMaxExposureCompensation()); + int min = Math.max(-3, mParameters.getMinExposureCompensation()); if (max == 0 && min == 0) { removePreference(group, exposure.getKey()); return; |