diff options
| author | jiaoyuan <jiaoyuan@codeaurora.org> | 2019-10-18 10:02:55 +0800 |
|---|---|---|
| committer | jiaoyuan <jiaoyuan@codeaurora.org> | 2019-10-18 10:02:55 +0800 |
| commit | 358b5c9fb67a69bfe823c3f24543090308bc445b (patch) | |
| tree | cfa60acb9927219c82f0d3c03d05ef09668febd3 | |
| parent | 240a5a28559c5fd2e5fc54ec5bd77d73bcf9e9ea (diff) | |
| download | android_packages_apps_Snap-358b5c9fb67a69bfe823c3f24543090308bc445b.tar.gz android_packages_apps_Snap-358b5c9fb67a69bfe823c3f24543090308bc445b.tar.bz2 android_packages_apps_Snap-358b5c9fb67a69bfe823c3f24543090308bc445b.zip | |
SnapdragonCamera: Flash icon appears after countdown
Flash icon appears after snapshot with
countdown timer in ProMode
Change-Id: I21101397b617e8afc433118400bb4b07ae061801
| -rwxr-xr-x[-rw-r--r--] | src/com/android/camera/ui/FlashToggleButton.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/camera/ui/FlashToggleButton.java b/src/com/android/camera/ui/FlashToggleButton.java index fa766bfb8..fca76b7a1 100644..100755 --- 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 { |