From 358b5c9fb67a69bfe823c3f24543090308bc445b Mon Sep 17 00:00:00 2001 From: jiaoyuan Date: Fri, 18 Oct 2019 10:02:55 +0800 Subject: SnapdragonCamera: Flash icon appears after countdown Flash icon appears after snapshot with countdown timer in ProMode Change-Id: I21101397b617e8afc433118400bb4b07ae061801 --- src/com/android/camera/ui/FlashToggleButton.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) mode change 100644 => 100755 src/com/android/camera/ui/FlashToggleButton.java (limited to 'src') diff --git a/src/com/android/camera/ui/FlashToggleButton.java b/src/com/android/camera/ui/FlashToggleButton.java old mode 100644 new mode 100755 index fa766bfb8..fca76b7a1 --- a/src/com/android/camera/ui/FlashToggleButton.java +++ b/src/com/android/camera/ui/FlashToggleButton.java @@ -71,8 +71,16 @@ public class FlashToggleButton extends RotateImageView { String userSetting = mContext.getString( 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 promode = false; + if (scene != null) { + int mode = Integer.parseInt(scene); + if (mode == SettingsManager.SCENE_MODE_PROMODE_INT) { + promode = true; + } + } if (mIndex == -1 || (redeye != null && redeye.equals("on")) || - manualExposureMode.equals(userSetting)) { + manualExposureMode.equals(userSetting) || promode) { setVisibility(GONE); return; } else { -- cgit v1.2.3