From: Spike Sprague <spikuru@google.com>
Date: Tue, 6 May 2014 20:55:38 +0000 (-0700)
Subject: moved set exposure limits code into an enabled check
X-Git-Tag: android-x86-6.0-r3~930^2~89
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=46acdc5401956ee4951d25d047ae892b78c13d86;p=android-x86%2Fpackages-apps-Camera2.git

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 8746b3af6..4691cf8ac 100644
--- 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 3a48af2ea..e92c2a7b4 100644
--- 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;