SnapdragonCamera: Restore color effect when set scene mode.

When set scene mode,there is no operation to color effect.

When set scene mode, add operations to reset color effect.

Change-Id: I05b7315f101e806a28424bd8a2d1f7038f27efc9
CRs-Fixed: 913811

1 files changed, 7 insertions, 0 deletions

diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 8bdbb6c47..20917b62b 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -1389,6 +1389,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);
     }