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 | |
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')
-rw-r--r-- | src/com/android/camera/CameraSettings.java | 11 | ||||
-rw-r--r-- | src/com/android/camera/PhotoMenu.java | 3 | ||||
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 26 |
3 files changed, 40 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 2bce3dd22..ad0bbc544 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -121,6 +121,7 @@ public class CameraSettings { private static final String KEY_QC_SUPPORTED_RE_FOCUS_MODES = "re-focus-values"; private static final String KEY_QC_SUPPORTED_CF_MODES = "chroma-flash-values"; private static final String KEY_QC_SUPPORTED_OZ_MODES = "opti-zoom-values"; + private static final String KEY_QC_SUPPORTED_FSSR_MODES = "FSSR-values"; private static final String KEY_QC_SUPPORTED_TP_MODES = "true-portrait-values"; private static final String KEY_QC_SUPPORTED_FACE_RECOGNITION_MODES = "face-recognition-values"; private static final String KEY_QC_SUPPORTED_DIS_MODES = "dis-values"; @@ -138,6 +139,7 @@ public class CameraSettings { public static final String KEY_QC_LEGACY_BURST = "snapshot-burst-num"; public static final String KEY_QC_CHROMA_FLASH = "chroma-flash"; public static final String KEY_QC_OPTI_ZOOM = "opti-zoom"; + public static final String KEY_QC_FSSR = "FSSR"; public static final String KEY_QC_TP = "true-portrait"; public static final String KEY_QC_FACE_RECOGNITION = "face-recognition"; public static final String KEY_QC_DIS_MODE = "dis"; @@ -354,6 +356,7 @@ public class CameraSettings { String str = params.get(KEY_QC_SUPPORTED_AF_BRACKETING_MODES); str += ',' + params.get(KEY_QC_SUPPORTED_CF_MODES); str += ',' + params.get(KEY_QC_SUPPORTED_OZ_MODES); + str += ',' + params.get(KEY_QC_SUPPORTED_FSSR_MODES); str += ',' + params.get(KEY_QC_SUPPORTED_TP_MODES); str += ',' + mContext.getString(R.string.pref_camera_advanced_feature_default); str += ',' + params.get(KEY_QC_SUPPORTED_RE_FOCUS_MODES); @@ -392,6 +395,14 @@ public class CameraSettings { return split(str); } + public static List<String> getSupportedFSSRModes(Parameters params) { + String str = params.get(KEY_QC_SUPPORTED_FSSR_MODES); + if (str == null) { + return null; + } + return split(str); + } + public static List<String> getSupportedTruePortraitModes(Parameters params) { String str = params.get(KEY_QC_SUPPORTED_TP_MODES); if (str == null) { 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); diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index dc5d10059..87bda8f8f 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); } } |