diff options
| author | xianming wang <mingwax@codeaurora.org> | 2018-03-01 15:05:31 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-03-05 19:22:09 -0800 |
| commit | 56bbfb648af37902139f26eb7647fd294cd01862 (patch) | |
| tree | b274eb71c5fc91de1c42f0f5920bbd0f545c2b46 /src/com/android/camera/ui | |
| parent | f49781cf8ec7a3f128414565500e9a1bb541e413 (diff) | |
| download | android_packages_apps_Snap-56bbfb648af37902139f26eb7647fd294cd01862.tar.gz android_packages_apps_Snap-56bbfb648af37902139f26eb7647fd294cd01862.tar.bz2 android_packages_apps_Snap-56bbfb648af37902139f26eb7647fd294cd01862.zip | |
SnapdragonCamera: Change flash OFF when use the User setting
Change the flash mode is OFF when select the Manual Exposure
User setting menu. Hide the flash menu in the capture view.
CRs-Fixed: 2167543
Change-Id: I9a45cc03743a6c617b2a4dc45ee36b0381b00fa5
Diffstat (limited to 'src/com/android/camera/ui')
| -rw-r--r-- | src/com/android/camera/ui/FlashToggleButton.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/camera/ui/FlashToggleButton.java b/src/com/android/camera/ui/FlashToggleButton.java index a75a11732..fa766bfb8 100644 --- a/src/com/android/camera/ui/FlashToggleButton.java +++ b/src/com/android/camera/ui/FlashToggleButton.java @@ -45,13 +45,16 @@ public class FlashToggleButton extends RotateImageView { private int[] videoFlashIcon = {R.drawable.flash_off, R.drawable.flash}; private int mIndex; private boolean mIsVideoFlash; + private Context mContext; public FlashToggleButton(Context context) { super(context); + mContext = context; } public FlashToggleButton(Context context, AttributeSet attrs) { super(context, attrs); + mContext = context; } public void init(boolean videoFlash) { @@ -65,7 +68,11 @@ public class FlashToggleButton extends RotateImageView { mSettingsManager = SettingsManager.getInstance(); mIndex = mSettingsManager.getValueIndex(key); String redeye = mSettingsManager.getValue(SettingsManager.KEY_REDEYE_REDUCTION); - if (mIndex == -1 || (redeye != null && redeye.equals("on"))) { + String userSetting = mContext.getString( + R.string.pref_camera_manual_exp_value_user_setting); + String manualExposureMode = mSettingsManager.getValue(SettingsManager.KEY_MANUAL_EXPOSURE); + if (mIndex == -1 || (redeye != null && redeye.equals("on")) || + manualExposureMode.equals(userSetting)) { setVisibility(GONE); return; } else { |