diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2013-11-19 05:30:44 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2013-11-19 05:30:44 -0800 |
| commit | cd30cdeaaf78fd0c4df5f7fc3f120b9dbcd697d4 (patch) | |
| tree | 97986c1c5794771519705f905fd982fa6b0eb695 /src/com/android/camera/WideAnglePanoramaModule.java | |
| parent | 33c5a41c62c1750cbc5931e6a71b7894c828cd04 (diff) | |
| parent | c3f8beb43472acfc241ae612a9ce4cce9cac984e (diff) | |
| download | android_packages_apps_Snap-cd30cdeaaf78fd0c4df5f7fc3f120b9dbcd697d4.tar.gz android_packages_apps_Snap-cd30cdeaaf78fd0c4df5f7fc3f120b9dbcd697d4.tar.bz2 android_packages_apps_Snap-cd30cdeaaf78fd0c4df5f7fc3f120b9dbcd697d4.zip | |
Merge "Reset scene mode to Auto in camcoder and panorama modes."
Diffstat (limited to 'src/com/android/camera/WideAnglePanoramaModule.java')
| -rw-r--r-- | src/com/android/camera/WideAnglePanoramaModule.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java index 3d0ae65ed..e6d0e92cc 100644 --- a/src/com/android/camera/WideAnglePanoramaModule.java +++ b/src/com/android/camera/WideAnglePanoramaModule.java @@ -329,6 +329,13 @@ public class WideAnglePanoramaModule return false; } Parameters parameters = mCameraDevice.getParameters(); + String sceneMode = parameters.getSceneMode(); + if ((null != sceneMode) && (!sceneMode.equals(Parameters.SCENE_MODE_AUTO))){ + if (CameraUtil.isSupported(Parameters.SCENE_MODE_AUTO, + parameters.getSupportedSceneModes())){ + parameters.setSceneMode(Parameters.SCENE_MODE_AUTO); + } + } setupCaptureParams(parameters); configureCamera(parameters); return true; |