diff options
author | Santhosh Kumar Thimmanna Bhattar <sthim@codeaurora.org> | 2014-10-15 15:14:45 +0530 |
---|---|---|
committer | Santhosh Kumar Thimmanna Bhattar <sthim@codeaurora.org> | 2014-10-27 18:42:32 +0530 |
commit | 22795c20844cd3dae0e33e1dd4ef53766a4dd255 (patch) | |
tree | b03f3589d410e534353bd66055c1e8660944154b /src/com/android/camera/PhotoModule.java | |
parent | 48b9c1b568f88ad713b5d6ce76b6241f8b33a5de (diff) | |
download | android_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/PhotoModule.java')
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 9ff97d5d5..f701fb407 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1576,6 +1576,8 @@ public class PhotoModule 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 truPortraitOn = mActivity.getString(R.string. pref_camera_advanced_feature_value_trueportrait_on); String optiZoom = @@ -1584,6 +1586,8 @@ public class PhotoModule mParameters.get(CameraSettings.KEY_QC_CHROMA_FLASH); String ubiFocus = mParameters.get(CameraSettings.KEY_QC_AF_BRACKETING); + String fssr = + mParameters.get(CameraSettings.KEY_QC_FSSR); String continuousShot = mParameters.get("long-shot"); String truePortrait = @@ -1610,6 +1614,7 @@ public class PhotoModule (reFocus != null && reFocus.equals(reFocusOn)) || (chromaFlash != null && chromaFlash.equals(chromaFlashOn)) || (optiZoom != null && optiZoom.equals(optiZoomOn)) || + (fssr != null && fssr.equals(fssrOn)) || (truePortrait != null && truePortrait.equals(truPortraitOn))) { mSceneMode = sceneMode = Parameters.SCENE_MODE_AUTO; flashMode = Parameters.FLASH_MODE_OFF; @@ -2551,6 +2556,7 @@ public class PhotoModule String chromaFlash, String reFocus, String optiZoom, + String fssr, String truePortrait) { if (CameraUtil.isSupported(ubiFocus, CameraSettings.getSupportedAFBracketingModes(mParameters))) { @@ -2568,6 +2574,10 @@ public class PhotoModule CameraSettings.getSupportedRefocusModes(mParameters))) { mParameters.set(CameraSettings.KEY_QC_RE_FOCUS, reFocus); } + if (CameraUtil.isSupported(fssr, + CameraSettings.getSupportedFSSRModes(mParameters))) { + mParameters.set(CameraSettings.KEY_QC_FSSR, fssr); + } if (CameraUtil.isSupported(truePortrait, CameraSettings.getSupportedTruePortraitModes(mParameters))) { mParameters.set(CameraSettings.KEY_QC_TP, truePortrait); @@ -2801,6 +2811,8 @@ public class PhotoModule pref_camera_advanced_feature_value_optizoom_off); String reFocusOff = mActivity.getString(R.string. pref_camera_advanced_feature_value_refocus_off); + String fssrOff = mActivity.getString(R.string. + pref_camera_advanced_feature_value_FSSR_off); String truePortraitOff = mActivity.getString(R.string. pref_camera_advanced_feature_value_trueportrait_off); @@ -2810,6 +2822,7 @@ public class PhotoModule chromaFlashOff, reFocusOff, optiZoomOff, + fssrOff, truePortraitOff); } else if (advancedFeature.equals(mActivity.getString(R.string. pref_camera_advanced_feature_value_chromaflash_on))) { @@ -2817,6 +2830,7 @@ public class PhotoModule advancedFeature, reFocusOff, optiZoomOff, + fssrOff, truePortraitOff); } else if (advancedFeature.equals(mActivity.getString(R.string. pref_camera_advanced_feature_value_refocus_on))) { @@ -2824,6 +2838,7 @@ public class PhotoModule chromaFlashOff, advancedFeature, optiZoomOff, + fssrOff, truePortraitOff); mRefocus = true; } else if (advancedFeature.equals(mActivity.getString(R.string. @@ -2832,6 +2847,15 @@ public class PhotoModule chromaFlashOff, reFocusOff, advancedFeature, + fssrOff, + truePortraitOff); + } else if (advancedFeature.equals(mActivity.getString(R.string. + pref_camera_advanced_feature_value_FSSR_on))) { + qcomUpdateAdvancedFeatures(ubiFocusOff, + chromaFlashOff, + reFocusOff, + optiZoomOff, + advancedFeature, truePortraitOff); } else if (advancedFeature.equals(mActivity.getString(R.string. pref_camera_advanced_feature_value_trueportrait_on))) { @@ -2839,12 +2863,14 @@ public class PhotoModule chromaFlashOff, reFocusOff, optiZoomOff, + fssrOff, advancedFeature); } else { qcomUpdateAdvancedFeatures(ubiFocusOff, chromaFlashOff, reFocusOff, optiZoomOff, + fssrOff, truePortraitOff); } } |