diff options
| author | xianming wang <mingwax@codeaurora.org> | 2018-10-25 15:38:35 +0800 |
|---|---|---|
| committer | xianming wang <mingwax@codeaurora.org> | 2018-12-07 14:21:56 +0800 |
| commit | 40e3806ecd16a188c5b0e0a9f57e98eefe712bd6 (patch) | |
| tree | eed9be9192f4e3a15468337fc5ec0483e0f707e5 | |
| parent | b1f0558be07bafe8d58982d1f508d372a54f66bc (diff) | |
| download | android_packages_apps_Snap-40e3806ecd16a188c5b0e0a9f57e98eefe712bd6.tar.gz android_packages_apps_Snap-40e3806ecd16a188c5b0e0a9f57e98eefe712bd6.tar.bz2 android_packages_apps_Snap-40e3806ecd16a188c5b0e0a9f57e98eefe712bd6.zip | |
SnapdragonCamera: SunSet and Landscape use HAL-ZSL mode
SunSet and Landscape use HAL-ZSL mode as default.
CRs-Fixed: 2358000
Change-Id: I60e03ca3ec084c3fa85c3504c73fd54daf9f6279
| -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; |