diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-07-08 16:08:22 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-07-08 16:08:22 -0700 |
| commit | c808751561a486e9cdfebe1db79ad9646406f69e (patch) | |
| tree | ba3704a8ef0b40ae4f4ebc2cfdf29f02d8d7e4cc /src | |
| parent | 5b7fe7b364eb2fa3a9b1a76120cd52a94396ba52 (diff) | |
| parent | 5de312217f89fb7c0729c0d9c091a4b6f73e49d6 (diff) | |
| download | android_packages_apps_Snap-c808751561a486e9cdfebe1db79ad9646406f69e.tar.gz android_packages_apps_Snap-c808751561a486e9cdfebe1db79ad9646406f69e.tar.bz2 android_packages_apps_Snap-c808751561a486e9cdfebe1db79ad9646406f69e.zip | |
Merge "Camera2: fix white balance still work when turn on the HDR mode"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 8 | ||||
| -rw-r--r-- | src/com/android/camera/PhotoUI.java | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 0356964c5..cb76c56e9 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1574,9 +1574,7 @@ public class PhotoModule // read settings from preferences so we retain user preferences. if (!Parameters.SCENE_MODE_AUTO.equals(mSceneMode)) { flashMode = mParameters.getFlashMode(); - String whiteBalance = mPreferences.getString( - CameraSettings.KEY_WHITE_BALANCE, - mActivity.getString(R.string.pref_camera_whitebalance_default)); + String whiteBalance = Parameters.WHITE_BALANCE_AUTO; focusMode = mFocusManager.getFocusMode(); colorEffect = mParameters.getColorEffect(); exposureCompensation = @@ -3054,6 +3052,10 @@ public class PhotoModule else { mParameters.setFlashMode(Parameters.FLASH_MODE_AUTO); } + if (CameraUtil.isSupported(Parameters.WHITE_BALANCE_AUTO, + mParameters.getSupportedWhiteBalance())) { + mParameters.setWhiteBalance(Parameters.WHITE_BALANCE_AUTO); + } } if (mContinuousFocusSupported && ApiHelper.HAS_AUTO_FOCUS_MOVE_CALLBACK) { diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index b0c642a8b..419cca22b 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -559,7 +559,10 @@ public class PhotoUI implements PieListener, CameraSettings.readExposure(prefs)); mOnScreenIndicators.updateFlashOnScreenIndicator(params.getFlashMode()); int wbIndex = -1; - String wb = params.getWhiteBalance(); + String wb = Camera.Parameters.WHITE_BALANCE_AUTO; + if (Camera.Parameters.SCENE_MODE_AUTO.equals(params.getSceneMode())) { + wb = params.getWhiteBalance(); + } ListPreference pref = group.findPreference(CameraSettings.KEY_WHITE_BALANCE); if (pref != null) { wbIndex = pref.findIndexOfValue(wb); |