diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-11-04 23:10:54 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-11-04 23:10:53 -0800 |
| commit | 9a306f7ccf3974ff4dbed40b1131529a64c7ee05 (patch) | |
| tree | 6fa5a1b52e690fd02085d3328f7701e7b64f8a68 /src/com/android/camera/PhotoMenu.java | |
| parent | 387dbe1e1e380729345aaf816ce84d73560067f4 (diff) | |
| parent | 22795c20844cd3dae0e33e1dd4ef53766a4dd255 (diff) | |
| download | android_packages_apps_Snap-9a306f7ccf3974ff4dbed40b1131529a64c7ee05.tar.gz android_packages_apps_Snap-9a306f7ccf3974ff4dbed40b1131529a64c7ee05.tar.bz2 android_packages_apps_Snap-9a306f7ccf3974ff4dbed40b1131529a64c7ee05.zip | |
Merge "Camera2: Add FSSR in Advanced features menu."
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 24fa51b63..5743312aa 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 fssrOn = mActivity.getString(R.string. + pref_camera_advanced_feature_value_FSSR_on); String truePortraitOn = mActivity.getString(R.string. pref_camera_advanced_feature_value_trueportrait_on); @@ -350,6 +352,7 @@ public class PhotoMenu extends PieController advancedFeatures.equals(chromaFlashOn) || advancedFeatures.equals(reFocusOn) || advancedFeatures.equals(optiZoomOn) || + advancedFeatures.equals(fssrOn) || advancedFeatures.equals(truePortraitOn))) { popup3.setPreferenceEnabled(CameraSettings.KEY_FOCUS_MODE,false); popup3.setPreferenceEnabled(CameraSettings.KEY_FLASH_MODE,false); |