moved set exposure limits code into an enabled check

bug: 14462164

Change-Id: Ia75449e92ffb46c8f19326828c81c40c053e7ad0

diff --git a/src/com/android/camera/app/CameraAppUI.java b/src/com/android/camera/app/CameraAppUI.java
index 8746b3a..4691cf8 100644 (file)
--- a/src/com/android/camera/app/CameraAppUI.java
+++ b/src/com/android/camera/app/CameraAppUI.java
@@ -1693,6 +1693,11 @@ public class CameraAppUI implements ModeListView.ModeSwitchListener,
             .getBoolean(SettingsManager.SETTING_EXPOSURE_COMPENSATION_ENABLED);
         if (enableExposureCompensation) {
             buttonManager.initializePushButton(ButtonManager.BUTTON_EXPOSURE_COMPENSATION, null);
+            buttonManager.setExposureCompensationParameters(
+                bottomBarSpec.minExposureCompensation,
+                bottomBarSpec.maxExposureCompensation,
+                bottomBarSpec.exposureCompensationStep);
+
             buttonManager.setExposureCompensationCallback(
                     bottomBarSpec.exposureCompensationSetCallback);
             buttonManager.updateExposureButtons();
@@ -1701,11 +1706,6 @@ public class CameraAppUI implements ModeListView.ModeSwitchListener,
             buttonManager.setExposureCompensationCallback(null);
         }
 
-        buttonManager.setExposureCompensationParameters(
-                bottomBarSpec.minExposureCompensation,
-                bottomBarSpec.maxExposureCompensation,
-                bottomBarSpec.exposureCompensationStep);
-
         /** Intent UI */
         if (bottomBarSpec.showCancel) {
             buttonManager.initializePushButton(ButtonManager.BUTTON_CANCEL,

diff --git a/src/com/android/camera/settings/SettingsManager.java b/src/com/android/camera/settings/SettingsManager.java
index 3a48af2..e92c2a7 100644 (file)
--- a/src/com/android/camera/settings/SettingsManager.java
+++ b/src/com/android/camera/settings/SettingsManager.java
@@ -958,6 +958,7 @@ public class SettingsManager {
         return new Setting(SOURCE_DEFAULT, TYPE_BOOLEAN, defaultValue,
                 KEY_EXPOSURE_COMPENSATION_ENABLED, values, FLUSH_OFF);
     }
+
     public static Setting getPictureSizeBackSetting(Context context) {
         String defaultValue = null;
         String[] values = null;