diff options
| author | Camera Software Integration <camswint@quicinc.com> | 2019-11-06 23:19:25 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-11-06 23:19:25 -0800 |
| commit | 97bcb1f9139d964ce67e2aabc512666036a39522 (patch) | |
| tree | c7522367e7fe5d626169fc789e5bad75cb017a5e /src | |
| parent | 39765335ed74d3b2ed5f4ad966c250b031821ae4 (diff) | |
| parent | 358b5c9fb67a69bfe823c3f24543090308bc445b (diff) | |
| download | android_packages_apps_Snap-97bcb1f9139d964ce67e2aabc512666036a39522.tar.gz android_packages_apps_Snap-97bcb1f9139d964ce67e2aabc512666036a39522.tar.bz2 android_packages_apps_Snap-97bcb1f9139d964ce67e2aabc512666036a39522.zip | |
Merge "SnapdragonCamera: Flash icon appears after countdown" into camera-SnapdragonCamera.lnx.2.0
Diffstat (limited to 'src')
| -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 { |