summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/ui/FlashToggleButton.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/camera/ui/FlashToggleButton.java')
-rwxr-xr-x[-rw-r--r--]src/com/android/camera/ui/FlashToggleButton.java10
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 {