diff options
author | jiaoyuan <jiaoyuan@codeaurora.org> | 2019-11-19 09:22:26 +0800 |
---|---|---|
committer | jiaoyuan <jiaoyuan@codeaurora.org> | 2019-11-19 09:23:40 +0800 |
commit | b1d05447afc30d1683980b42ae23aa2234e2b374 (patch) | |
tree | addd827cf28bc2e391670d93d6a012fa448858e1 /src/com/android | |
parent | f3b7cacf2b53b3239fc29ffddc2028be6dba89a2 (diff) | |
download | android_packages_apps_Snap-b1d05447afc30d1683980b42ae23aa2234e2b374.tar.gz android_packages_apps_Snap-b1d05447afc30d1683980b42ae23aa2234e2b374.tar.bz2 android_packages_apps_Snap-b1d05447afc30d1683980b42ae23aa2234e2b374.zip |
SnapdraongCamera: hide flash icon
Flash icon should be hidden when SW MFNR enabled.
Change-Id: I6dee92825d1b069f364a325457cf82ed9f649a68
Diffstat (limited to 'src/com/android')
-rwxr-xr-x | src/com/android/camera/ui/FlashToggleButton.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/camera/ui/FlashToggleButton.java b/src/com/android/camera/ui/FlashToggleButton.java index fca76b7a1..abeedef21 100755 --- a/src/com/android/camera/ui/FlashToggleButton.java +++ b/src/com/android/camera/ui/FlashToggleButton.java @@ -72,6 +72,11 @@ public class FlashToggleButton extends RotateImageView { R.string.pref_camera_manual_exp_value_user_setting); String manualExposureMode = mSettingsManager.getValue(SettingsManager.KEY_MANUAL_EXPOSURE); String scene = mSettingsManager.getValue(SettingsManager.KEY_SCENE_MODE); + boolean mfnrEnable = false; + String mfnrValue = mSettingsManager.getValue(SettingsManager.KEY_CAPTURE_MFNR_VALUE); + if (mfnrValue != null) { + mfnrEnable = mfnrValue.equals("1"); + } boolean promode = false; if (scene != null) { int mode = Integer.parseInt(scene); @@ -80,7 +85,7 @@ public class FlashToggleButton extends RotateImageView { } } if (mIndex == -1 || (redeye != null && redeye.equals("on")) || - manualExposureMode.equals(userSetting) || promode) { + manualExposureMode.equals(userSetting) || promode || mfnrEnable) { setVisibility(GONE); return; } else { |