diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-08-03 15:40:15 -0700 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2017-01-04 22:00:38 +0200 |
| commit | 2b57b443f4f281d066a6f3b6a150ceb3d670c45a (patch) | |
| tree | 5d5a367825f29ceef6e4c581759c63db531c1717 /src/com/android/camera/PhotoMenu.java | |
| parent | bb9ab5d65643e312d320288fae9a174a1e2ac86d (diff) | |
| download | android_packages_apps_Snap-2b57b443f4f281d066a6f3b6a150ceb3d670c45a.tar.gz android_packages_apps_Snap-2b57b443f4f281d066a6f3b6a150ceb3d670c45a.tar.bz2 android_packages_apps_Snap-2b57b443f4f281d066a6f3b6a150ceb3d670c45a.zip | |
snap: Fixes for advanced features and scene modes
* Get rid of the annoying toast when longshot is disabled
* Add support for ChromaFlash as a scene mode
* Adjust overrides for various scene modes
Change-Id: Ifda1990f4e9b3435655664f2a6c2b31fc3ae23fa
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
| -rwxr-xr-x | src/com/android/camera/PhotoMenu.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 8d7730759..38a81c8bf 100755 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -1480,13 +1480,12 @@ public class PhotoMenu extends MenuController } } - String chromaFlashOn = mActivity.getString(R.string. - pref_camera_advanced_feature_value_chromaflash_on); - if (notSame(pref, CameraSettings.KEY_SCENE_MODE, Parameters.SCENE_MODE_AUTO)) { + String chromaFlashOn = mActivity.getString(R.string + .pref_camera_advanced_feature_value_chromaflash_on); + if (notSame(pref, CameraSettings.KEY_SCENE_MODE, chromaFlashOn)) { ListPreference lp = mPreferenceGroup .findPreference(CameraSettings.KEY_ADVANCED_FEATURES); if (lp != null && chromaFlashOn.equals(lp.getValue())) { - setPreference(CameraSettings.KEY_QC_CHROMA_FLASH, mSettingOff); setPreference(CameraSettings.KEY_ADVANCED_FEATURES, mActivity.getString(R.string.pref_camera_advanced_feature_default)); } |