Add SCENE_MODE_OFF support for Camera app

Some cameras by qcom need SCENE_MODE_OFF instead of SCENE_MODE_AUTO, otherwise camera HAL thinks there is an active scene mode and disables features like LED flash. Change-Id: I3a2d194d2c7e719c67a8d3e4ac5936c49391be59
CyanogenMod · Aug 22, 2012 · c1ae614 · c1ae614
1 parent 377d9d2
commit c1ae614
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
@@ -835,8 +835,8 @@ private void updateFocusOnScreenIndicator(String value) {
     }
 
     private void updateOnScreenIndicators() {
-        boolean isAutoScene = !(Parameters.SCENE_MODE_AUTO.equals(mParameters.getSceneMode()));
-        updateSceneOnScreenIndicator(isAutoScene);
+        boolean isAutoScene = (Parameters.SCENE_MODE_AUTO.equals(mParameters.getSceneMode()) || Parameters.SCENE_MODE_OFF.equals(mParameters.getSceneMode()));
+        updateSceneOnScreenIndicator(!isAutoScene);
         updateExposureOnScreenIndicator(CameraSettings.readExposure(mPreferences));
         updateFlashOnScreenIndicator(mParameters.getFlashMode());
         updateTimerOnScreenIndicator();
@@ -1382,11 +1382,11 @@ private void overrideCameraSettings(final String flashMode,
     private void updateSceneModeUI() {
         // If scene mode is set, we cannot set flash mode, white balance, and
         // focus mode, instead, we read it from driver
-        if (!Parameters.SCENE_MODE_AUTO.equals(mSceneMode)) {
+        if (Parameters.SCENE_MODE_AUTO.equals(mSceneMode) || Parameters.SCENE_MODE_OFF.equals(mSceneMode)) {
+            overrideCameraSettings(null, null, null);
+        } else {
             overrideCameraSettings(mParameters.getFlashMode(),
                     mParameters.getWhiteBalance(), mParameters.getFocusMode());
-        } else {
-            overrideCameraSettings(null, null, null);
         }
     }
 
@@ -2299,7 +2299,7 @@ private void updateCameraParametersPreference() {
             Log.w(TAG, "invalid exposure range: " + value);
         }
 
-        if (Parameters.SCENE_MODE_AUTO.equals(mSceneMode)) {
+        if (Parameters.SCENE_MODE_AUTO.equals(mSceneMode) || Parameters.SCENE_MODE_OFF.equals(mSceneMode)) {
             // Set flash mode.
             String flashMode = mPreferences.getString(
                     CameraSettings.KEY_FLASH_MODE,