diff options
| -rw-r--r-- | assets/dependency.json | 6 | ||||
| -rwxr-xr-x | src/com/android/camera/SettingsManager.java | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/assets/dependency.json b/assets/dependency.json index 2a6339083..3ded5afb5 100644 --- a/assets/dependency.json +++ b/assets/dependency.json @@ -49,7 +49,8 @@ "pref_camera2_longshot_key":"off"} , "4": - {"pref_camera2_coloreffect_key":"0"} + {"pref_camera2_coloreffect_key":"0", + "pref_camera2_zsl_key":"hal-zsl"} , "5": {"pref_camera2_coloreffect_key":"0", @@ -62,7 +63,8 @@ {"pref_camera2_coloreffect_key":"0"} , "10": - {"pref_camera2_coloreffect_key":"0"} + {"pref_camera2_coloreffect_key":"0", + "pref_camera2_zsl_key":"hal-zsl"} , "13": {"pref_camera2_coloreffect_key":"0"} diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java index 08488c9ee..b62573b76 100755 --- a/src/com/android/camera/SettingsManager.java +++ b/src/com/android/camera/SettingsManager.java @@ -1756,11 +1756,7 @@ public class SettingsManager implements ListMenu.SettingsListener { public boolean isZSLInAppEnabled(){ String value = getValue(KEY_ZSL); String appZSLValue = mContext.getString(R.string.pref_camera2_zsl_entryvalue_app_zsl); - if ( (value != null && value.equals(appZSLValue)) || - SettingsManager.SCENE_MODE_SUNSET_STRING.equals( - SettingsManager.getInstance().getValue(SettingsManager.KEY_SCENE_MODE)) || - SettingsManager.SCENE_MODE_LANDSCAPE_STRING.equals( - SettingsManager.getInstance().getValue(SettingsManager.KEY_SCENE_MODE))){ + if ( value != null && value.equals(appZSLValue)){ return true; }else{ return false; |