summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoMenu.java
diff options
context:
space:
mode:
authorSanthosh Kumar Thimmanna Bhattar <sthim@codeaurora.org>2014-10-15 15:14:45 +0530
committerSanthosh Kumar Thimmanna Bhattar <sthim@codeaurora.org>2014-10-27 18:42:32 +0530
commit22795c20844cd3dae0e33e1dd4ef53766a4dd255 (patch)
treeb03f3589d410e534353bd66055c1e8660944154b /src/com/android/camera/PhotoMenu.java
parent48b9c1b568f88ad713b5d6ce76b6241f8b33a5de (diff)
downloadandroid_packages_apps_Snap-22795c20844cd3dae0e33e1dd4ef53766a4dd255.tar.gz
android_packages_apps_Snap-22795c20844cd3dae0e33e1dd4ef53766a4dd255.tar.bz2
android_packages_apps_Snap-22795c20844cd3dae0e33e1dd4ef53766a4dd255.zip
Camera2: Add FSSR in Advanced features menu.
1.Add FSSR option in Advanced features menu. 2.Query supported FSSR modes and enable FSSR. Change-Id: I40b9c7875483d022a1561b17aeb90d2e4cb789ce
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
-rw-r--r--src/com/android/camera/PhotoMenu.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 21446baa6..deeea89ee 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -330,6 +330,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);
@@ -349,6 +351,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);