diff options
| author | Camera Software Integration <camswint@localhost> | 2017-03-09 06:38:39 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-09 06:38:39 -0800 |
| commit | bf2885f3afdbcecc42a6ffec26d691b170e5c5fa (patch) | |
| tree | fe066488c9ecbf1ea6aa0efbd1824848c48ede0a /src/com/android/camera/PhotoModule.java | |
| parent | 9e3c8599f9bf119b5eedb6a62a5d71da1f806b6b (diff) | |
| parent | 45de0cfd204583c4c9fc2133cc428835361a24a5 (diff) | |
| download | android_packages_apps_Snap-bf2885f3afdbcecc42a6ffec26d691b170e5c5fa.tar.gz android_packages_apps_Snap-bf2885f3afdbcecc42a6ffec26d691b170e5c5fa.tar.bz2 android_packages_apps_Snap-bf2885f3afdbcecc42a6ffec26d691b170e5c5fa.zip | |
Merge "SnapdragonCamera: enable Continous shot option for zzHDR" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 3494b7a4c..49cb09936 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -224,6 +224,7 @@ public class PhotoModule private static final String PERSIST_CAPTURE_ANIMATION = "persist.camera.capture.animate"; private static final boolean PERSIST_SKIP_MEM_CHECK = android.os.SystemProperties.getBoolean("persist.camera.perf.skip_memck", false); + private static final String PERSIST_ZZHDR_ENABLE="persist.camera.zzhdr.enable"; private static final int MINIMUM_BRIGHTNESS = 0; private static final int MAXIMUM_BRIGHTNESS = 6; @@ -1996,7 +1997,9 @@ public class PhotoModule colorEffect = mParameters.getColorEffect(); String defaultEffect = mActivity.getString(R.string.pref_camera_coloreffect_default); if (CameraUtil.SCENE_MODE_HDR.equals(mSceneMode)) { - disableLongShot = true; + if(SystemProperties.getInt(PERSIST_ZZHDR_ENABLE, 0) != 1) { + disableLongShot = true; + } if (colorEffect != null & !colorEffect.equals(defaultEffect)) { // Change the colorEffect to default(None effect) when HDR ON. colorEffect = defaultEffect; |