diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-11-04 23:10:52 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-11-04 23:10:52 -0800 |
| commit | d2c7cc1b4f524a4221f417bc7fb3e2b70060f5a7 (patch) | |
| tree | a3ff46490d44830a38c2b7bc893bcc72fa1f3503 /src/com/android/camera/PhotoMenu.java | |
| parent | b0673a18e9e73fff431a20b63e0d4eb1fef7c627 (diff) | |
| parent | 5b88d56a1dac39eabaef3fb8b7222730911fe544 (diff) | |
| download | android_packages_apps_Snap-d2c7cc1b4f524a4221f417bc7fb3e2b70060f5a7.tar.gz android_packages_apps_Snap-d2c7cc1b4f524a4221f417bc7fb3e2b70060f5a7.tar.bz2 android_packages_apps_Snap-d2c7cc1b4f524a4221f417bc7fb3e2b70060f5a7.zip | |
Merge "Camera2: Add TruePortrait in Advanced features menu."
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 5942e600f..24fa51b63 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -331,6 +331,8 @@ public class PhotoMenu extends PieController pref_camera_advanced_feature_value_chromaflash_on); String optiZoomOn = mActivity.getString(R.string. pref_camera_advanced_feature_value_optizoom_on); + String truePortraitOn = mActivity.getString(R.string. + pref_camera_advanced_feature_value_trueportrait_on); if ((zsl != null) && Parameters.ZSL_OFF.equals(zsl)) { popup3.overrideSettings(CameraSettings.KEY_ADVANCED_FEATURES, @@ -347,7 +349,8 @@ public class PhotoMenu extends PieController if ((advancedFeatures != null) && (advancedFeatures.equals(ubiFocusOn) || advancedFeatures.equals(chromaFlashOn) || advancedFeatures.equals(reFocusOn) || - advancedFeatures.equals(optiZoomOn))) { + advancedFeatures.equals(optiZoomOn) || + advancedFeatures.equals(truePortraitOn))) { popup3.setPreferenceEnabled(CameraSettings.KEY_FOCUS_MODE,false); popup3.setPreferenceEnabled(CameraSettings.KEY_FLASH_MODE,false); popup3.setPreferenceEnabled(CameraSettings.KEY_AE_BRACKET_HDR,false); |