diff options
author | Sai Kumar Sanagavarapu <ssanagav@codeaurora.org> | 2014-06-04 13:53:37 +0530 |
---|---|---|
committer | Santhosh Kumar Thimmanna Bhattar <sthim@codeaurora.org> | 2014-10-27 18:40:02 +0530 |
commit | 5b88d56a1dac39eabaef3fb8b7222730911fe544 (patch) | |
tree | 1d692e5ea589caf315d2c3f03b3024c5cda30dfd /src/com/android/camera | |
parent | d71a65adc227a04cf2e95545af7b6ba71f8f1672 (diff) | |
download | android_packages_apps_Snap-5b88d56a1dac39eabaef3fb8b7222730911fe544.tar.gz android_packages_apps_Snap-5b88d56a1dac39eabaef3fb8b7222730911fe544.tar.bz2 android_packages_apps_Snap-5b88d56a1dac39eabaef3fb8b7222730911fe544.zip |
Camera2: Add TruePortrait in Advanced features menu.
1.Add TruePortrait option in Advanced features menu.
2.Query supported TruePortrait modes and enable TP.
Change-Id: I3e9bd54ab8e495eabb591bd380cf0553715e938a
Diffstat (limited to 'src/com/android/camera')
-rw-r--r-- | src/com/android/camera/CameraSettings.java | 10 | ||||
-rw-r--r-- | src/com/android/camera/PhotoMenu.java | 5 | ||||
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 36 |
3 files changed, 44 insertions, 7 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 8a84326ff..e1e964bc0 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -120,6 +120,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_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"; private static final String KEY_QC_SUPPORTED_CDS_MODES = "cds-mode-values"; @@ -135,6 +136,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_TP = "true-portrait"; public static final String KEY_QC_FACE_RECOGNITION = "face-recognition"; public static final String KEY_QC_DIS_MODE = "dis"; public static final String KEY_QC_CDS_MODE = "cds-mode"; @@ -341,6 +343,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_TP_MODES); str += ',' + mContext.getString(R.string.pref_camera_advanced_feature_default); str += ',' + params.get(KEY_QC_SUPPORTED_RE_FOCUS_MODES); return split(str); @@ -378,6 +381,13 @@ public class CameraSettings { return split(str); } + public static List<String> getSupportedTruePortraitModes(Parameters params) { + String str = params.get(KEY_QC_SUPPORTED_TP_MODES); + if (str == null) { + return null; + } + return split(str); + } // Splits a comma delimited string to an ArrayList of String. // Return null if the passing string is null or the size is 0. diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 3132a7928..21446baa6 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 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, @@ -346,7 +348,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); diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index cefdeaea6..9ff97d5d5 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 truPortraitOn = mActivity.getString(R.string. + pref_camera_advanced_feature_value_trueportrait_on); String optiZoom = mParameters.get(CameraSettings.KEY_QC_OPTI_ZOOM); String chromaFlash = @@ -1584,6 +1586,8 @@ public class PhotoModule mParameters.get(CameraSettings.KEY_QC_AF_BRACKETING); String continuousShot = mParameters.get("long-shot"); + String truePortrait = + mParameters.get(CameraSettings.KEY_QC_TP); if ((continuousShot != null) && continuousShot.equals(continuousShotOn)) { String pictureFormat = mActivity.getString(R.string. @@ -1605,7 +1609,8 @@ public class PhotoModule if ((ubiFocus != null && ubiFocus.equals(ubiFocusOn)) || (reFocus != null && reFocus.equals(reFocusOn)) || (chromaFlash != null && chromaFlash.equals(chromaFlashOn)) || - (optiZoom != null && optiZoom.equals(optiZoomOn))) { + (optiZoom != null && optiZoom.equals(optiZoomOn)) || + (truePortrait != null && truePortrait.equals(truPortraitOn))) { mSceneMode = sceneMode = Parameters.SCENE_MODE_AUTO; flashMode = Parameters.FLASH_MODE_OFF; focusMode = Parameters.FOCUS_MODE_INFINITY; @@ -2545,7 +2550,8 @@ public class PhotoModule private void qcomUpdateAdvancedFeatures(String ubiFocus, String chromaFlash, String reFocus, - String optiZoom) { + String optiZoom, + String truePortrait) { if (CameraUtil.isSupported(ubiFocus, CameraSettings.getSupportedAFBracketingModes(mParameters))) { mParameters.set(CameraSettings.KEY_QC_AF_BRACKETING, ubiFocus); @@ -2562,6 +2568,10 @@ public class PhotoModule CameraSettings.getSupportedRefocusModes(mParameters))) { mParameters.set(CameraSettings.KEY_QC_RE_FOCUS, reFocus); } + if (CameraUtil.isSupported(truePortrait, + CameraSettings.getSupportedTruePortraitModes(mParameters))) { + mParameters.set(CameraSettings.KEY_QC_TP, truePortrait); + } } /** This can run on a background thread, so don't do UI updates here.*/ @@ -2791,37 +2801,51 @@ public class PhotoModule pref_camera_advanced_feature_value_optizoom_off); String reFocusOff = mActivity.getString(R.string. pref_camera_advanced_feature_value_refocus_off); + String truePortraitOff = mActivity.getString(R.string. + pref_camera_advanced_feature_value_trueportrait_off); if (advancedFeature.equals(mActivity.getString(R.string. pref_camera_advanced_feature_value_ubifocus_on))) { qcomUpdateAdvancedFeatures(advancedFeature, chromaFlashOff, reFocusOff, - optiZoomOff); + optiZoomOff, + truePortraitOff); } else if (advancedFeature.equals(mActivity.getString(R.string. pref_camera_advanced_feature_value_chromaflash_on))) { qcomUpdateAdvancedFeatures(ubiFocusOff, advancedFeature, reFocusOff, - optiZoomOff); + optiZoomOff, + truePortraitOff); } else if (advancedFeature.equals(mActivity.getString(R.string. pref_camera_advanced_feature_value_refocus_on))) { qcomUpdateAdvancedFeatures(ubiFocusOff, chromaFlashOff, advancedFeature, - optiZoomOff); + optiZoomOff, + truePortraitOff); mRefocus = true; } else if (advancedFeature.equals(mActivity.getString(R.string. pref_camera_advanced_feature_value_optizoom_on))) { qcomUpdateAdvancedFeatures(ubiFocusOff, chromaFlashOff, reFocusOff, + advancedFeature, + truePortraitOff); + } else if (advancedFeature.equals(mActivity.getString(R.string. + pref_camera_advanced_feature_value_trueportrait_on))) { + qcomUpdateAdvancedFeatures(ubiFocusOff, + chromaFlashOff, + reFocusOff, + optiZoomOff, advancedFeature); } else { qcomUpdateAdvancedFeatures(ubiFocusOff, chromaFlashOff, reFocusOff, - optiZoomOff); + optiZoomOff, + truePortraitOff); } } // Set auto exposure parameter. |