diff options
| author | kaiyiz <kaiyiz@codeaurora.org> | 2014-06-30 16:31:14 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-07-03 04:05:59 -0700 |
| commit | 5de312217f89fb7c0729c0d9c091a4b6f73e49d6 (patch) | |
| tree | 8fbb280dc55a58d35558d8707ca0731ff6147a77 /src | |
| parent | 4138cf070c6c748fff65bb1d7dbe8fd67a417fa9 (diff) | |
| download | android_packages_apps_Snap-5de312217f89fb7c0729c0d9c091a4b6f73e49d6.tar.gz android_packages_apps_Snap-5de312217f89fb7c0729c0d9c091a4b6f73e49d6.tar.bz2 android_packages_apps_Snap-5de312217f89fb7c0729c0d9c091a4b6f73e49d6.zip | |
Camera2: fix white balance still work when turn on the HDR mode
Tested on target : 8916
Tested on Branch : kk
Tested on AU \ tip : AU_LINUX_ANDROID_LNX.LA.3.7.1.04.04.03.031.203
Test case Verified : Yes
CR Moved to Fix : Yes
R notes filled : Yes
DC set : Yes
LOST approved (if new file \ feature added): Yes
Voted on required Trunk : NA
App need clear the whitebalance effect when set scene mode not auto, but
the value getWhiteBalance still is not auto when change scene mode.
So set white balance auto value forcely when scene mode is not auto.
CRs-Fixed: 685240
Change-Id: Ib94b9cb1f3cc0c8ef63412ef75d65359ba797f37
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 611207623..d6c947f8a 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1537,9 +1537,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 = @@ -2996,6 +2994,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); |