summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamera Software Integration <camswint@quicinc.com>2019-11-28 23:47:10 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2019-11-28 23:47:10 -0800
commitaf6219357af1fea6a580f07766bf3c3e6e9d4c5f (patch)
treeaff188b40f92fc425e0d3ed5854fc94ac4ff9987
parent45726bc011980112d45ef160a9ac1c525c36ee00 (diff)
parentb1d05447afc30d1683980b42ae23aa2234e2b374 (diff)
downloadandroid_packages_apps_Snap-af6219357af1fea6a580f07766bf3c3e6e9d4c5f.zip
android_packages_apps_Snap-af6219357af1fea6a580f07766bf3c3e6e9d4c5f.tar.gz
android_packages_apps_Snap-af6219357af1fea6a580f07766bf3c3e6e9d4c5f.tar.bz2
Merge "SnapdraongCamera: hide flash icon" into camera-SnapdragonCamera.lnx.2.0
-rwxr-xr-xsrc/com/android/camera/ui/FlashToggleButton.java7
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 fca76b7..abeedef 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 {