diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-10-05 20:04:02 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-10-05 20:04:02 -0700 |
| commit | cf2b0f960c7f32fb14656515a8d984a7fa6a3e30 (patch) | |
| tree | 853b3510ace1a5da4f87c943f37660fd59a7f160 | |
| parent | d0497566f2fd33536017821429a904366a0bce0e (diff) | |
| parent | 5b69b359fbeb5507855a9e040f6527d9d796b76c (diff) | |
| download | android_packages_apps_Snap-cf2b0f960c7f32fb14656515a8d984a7fa6a3e30.tar.gz android_packages_apps_Snap-cf2b0f960c7f32fb14656515a8d984a7fa6a3e30.tar.bz2 android_packages_apps_Snap-cf2b0f960c7f32fb14656515a8d984a7fa6a3e30.zip | |
Merge "SnapdragonCamera: Restore color effect when set scene mode."
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index bf6e31235..ef4308611 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -1400,6 +1400,13 @@ public class PhotoMenu extends MenuController mActivity.getString(R.string.pref_camera_advanced_feature_default)); } } + + String scene_auto = mActivity.getString(R.string + .pref_camera_scenemode_entry_auto); + if (notSame(pref, CameraSettings.KEY_SCENE_MODE, scene_auto)) { + setPreference(CameraSettings.KEY_COLOR_EFFECT, + mActivity.getString(R.string.pref_camera_coloreffect_default)); + } updateFilterModeIcon(pref, pref); super.onSettingChanged(pref); } |