diff options
| author | Michael Kolb <kolby@google.com> | 2013-06-24 13:22:52 -0700 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2014-10-20 22:41:50 +0000 |
| commit | 79c0c0525572efdda9f0a273bdee418e67c96136 (patch) | |
| tree | 64158e16a17bf946fb4b873196d7337a05f33a06 | |
| parent | d97814a7f6d364445f7316965fdf18a687a57a46 (diff) | |
| download | android_packages_apps_Camera2-79c0c0525572efdda9f0a273bdee418e67c96136.tar.gz android_packages_apps_Camera2-79c0c0525572efdda9f0a273bdee418e67c96136.tar.bz2 android_packages_apps_Camera2-79c0c0525572efdda9f0a273bdee418e67c96136.zip | |
Fix WB indicator override
Patching into Carlsbad from Bryce.
Bug: 9372794
Change-Id: I4f23f05ca1acaef84a24034237e82001aac09f78
| -rw-r--r-- | src/com/android/camera/PhotoUI.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index 80e6b13d4..8cc1cacc7 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -619,12 +619,15 @@ public class PhotoUI implements PieListener, mOnScreenIndicators.updateExposureOnScreenIndicator(params, CameraSettings.readExposure(prefs)); mOnScreenIndicators.updateFlashOnScreenIndicator(params.getFlashMode()); - int wbIndex = 2; + int wbIndex = -1; + String wb = params.getWhiteBalance(); ListPreference pref = group.findPreference(CameraSettings.KEY_WHITE_BALANCE); if (pref != null) { - wbIndex = pref.getCurrentIndex(); + wbIndex = pref.findIndexOfValue(wb); } - mOnScreenIndicators.updateWBIndicator(wbIndex); + // make sure the correct value was found + // otherwise use auto index + mOnScreenIndicators.updateWBIndicator(wbIndex < 0 ? 2 : wbIndex); boolean location = RecordLocationPreference.get( prefs, mActivity.getContentResolver()); mOnScreenIndicators.updateLocationIndicator(location); |