diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-01-09 22:48:22 -0800 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2019-01-09 22:48:22 -0800 |
| commit | 3853cc83a73ac0fac77adac9ecba346e8731cc09 (patch) | |
| tree | 4d36d64b0842eb6c8ea1fae4d851760047879181 /src/com/android/camera/SettingsManager.java | |
| parent | 39075a5313806d04207bcacdd93c6eaa36606f73 (diff) | |
| parent | 5455b09e9e1d76cba58624934e639564222ac994 (diff) | |
| download | android_packages_apps_Snap-3853cc83a73ac0fac77adac9ecba346e8731cc09.tar.gz android_packages_apps_Snap-3853cc83a73ac0fac77adac9ecba346e8731cc09.tar.bz2 android_packages_apps_Snap-3853cc83a73ac0fac77adac9ecba346e8731cc09.zip | |
Merge 5455b09e9e1d76cba58624934e639564222ac994 on remote branch
Change-Id: Ic2d394c5f6984c423412fa4284823c57db4af0fd
Diffstat (limited to 'src/com/android/camera/SettingsManager.java')
| -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 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; |