diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-18 15:01:38 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-18 15:01:38 -0700 |
| commit | c221aa033f25b5c020e77440c384cd6a78763566 (patch) | |
| tree | cb416d056b918cca979e053da6befbeed1a719d1 /src/com/android/camera/PhotoMenu.java | |
| parent | 81c75cf6d3a79258d194a25d6218c3919c440f66 (diff) | |
| parent | efc2e6bbc44f1f14ac5d1ddd61f125d132cc6fee (diff) | |
| download | android_packages_apps_Snap-c221aa033f25b5c020e77440c384cd6a78763566.tar.gz android_packages_apps_Snap-c221aa033f25b5c020e77440c384cd6a78763566.tar.bz2 android_packages_apps_Snap-c221aa033f25b5c020e77440c384cd6a78763566.zip | |
Merge "SnapdragonCamera: set flash off when stillmore is on" into camera.lnx.1.0-dev.1.0
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 6d1be0eff..dca66d1cb 100755 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -1482,6 +1482,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); |