diff options
| author | junjiez <junjiez@codeaurora.org> | 2016-08-04 14:31:49 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-04 02:57:53 -0700 |
| commit | efc2e6bbc44f1f14ac5d1ddd61f125d132cc6fee (patch) | |
| tree | 960a70932e2c2b8b24733ae6b5064417a6b68ae0 /src/com/android/camera/PhotoMenu.java | |
| parent | 4a321b93859924379d55289efc6c99a817ded542 (diff) | |
| download | android_packages_apps_Snap-efc2e6bbc44f1f14ac5d1ddd61f125d132cc6fee.tar.gz android_packages_apps_Snap-efc2e6bbc44f1f14ac5d1ddd61f125d132cc6fee.tar.bz2 android_packages_apps_Snap-efc2e6bbc44f1f14ac5d1ddd61f125d132cc6fee.zip | |
SnapdragonCamera: set flash off when stillmore is on
If stillmore is on, set flash to off
Change-Id: Ieab39f4916d07be8cda5179a15c1d0f3af2472bb
CRs-Fixed: 1046143
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
| -rwxr-xr-x | src/com/android/camera/PhotoMenu.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index c2f9a538b..61111a64e 100755 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -1478,6 +1478,12 @@ public class PhotoMenu extends MenuController mActivity.getString(R.string.pref_camera_coloreffect_default)); } + String stillMoreOn = mActivity.getString(R.string. + pref_camera_advanced_feature_value_stillmore_on); + if (same(pref, CameraSettings.KEY_ADVANCED_FEATURES, stillMoreOn)) { + setPreference(CameraSettings.KEY_FLASH_MODE, Parameters.FLASH_MODE_OFF); + } + ListPreference autoHdrPref = mPreferenceGroup.findPreference(CameraSettings.KEY_AUTO_HDR); if (autoHdrPref != null && autoHdrPref.getValue().equalsIgnoreCase("enable")) { mHdrSwitcher.setVisibility(View.GONE); |