diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-11-30 10:12:58 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-11-30 10:12:59 -0800 |
| commit | 041f347e575da3bb725fdadaa81a83e590b5cfd2 (patch) | |
| tree | e6b29df6fe2d01a74a72379459379f6c8d9c9a4d /src | |
| parent | 28eef35cdf89d3ea7ea1e63d1d45a3c032216579 (diff) | |
| parent | 9c4b51a3750c641715475ef96809513e75c552c4 (diff) | |
| download | android_packages_apps_Snap-041f347e575da3bb725fdadaa81a83e590b5cfd2.tar.gz android_packages_apps_Snap-041f347e575da3bb725fdadaa81a83e590b5cfd2.tar.bz2 android_packages_apps_Snap-041f347e575da3bb725fdadaa81a83e590b5cfd2.zip | |
Merge "SnapdragonCamera: SunSet and Landscape use HAL-ZSL mode" into camera-SnapdragonCamera.lnx.2.0
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/camera/SettingsManager.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java index cb434f1ba..0a8e00ecc 100755 --- a/src/com/android/camera/SettingsManager.java +++ b/src/com/android/camera/SettingsManager.java @@ -1817,11 +1817,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; |