diff options
author | Santhosh Kumar Thimmanna Bhattar <sthim@codeaurora.org> | 2014-10-15 15:07:08 +0530 |
---|---|---|
committer | Santhosh Kumar Thimmanna Bhattar <sthim@codeaurora.org> | 2014-10-27 18:41:33 +0530 |
commit | 48b9c1b568f88ad713b5d6ce76b6241f8b33a5de (patch) | |
tree | ac55c0afa809e80f88c23bc55b0eb92d3e9bd384 /src/com/android/camera/CameraSettings.java | |
parent | 5b88d56a1dac39eabaef3fb8b7222730911fe544 (diff) | |
download | android_packages_apps_Snap-48b9c1b568f88ad713b5d6ce76b6241f8b33a5de.tar.gz android_packages_apps_Snap-48b9c1b568f88ad713b5d6ce76b6241f8b33a5de.tar.bz2 android_packages_apps_Snap-48b9c1b568f88ad713b5d6ce76b6241f8b33a5de.zip |
Camera2: Add See More feature in the menu
- User can select See More feature in video mode.
Change-Id: I13636846cce67caeb6eb0b3e073399fdae2be471
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
-rw-r--r-- | src/com/android/camera/CameraSettings.java | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index e1e964bc0..2bce3dd22 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -105,6 +105,7 @@ public class CameraSettings { public static final String KEY_VIDEO_SNAPSHOT_SIZE = "pref_camera_videosnapsize_key"; public static final String KEY_VIDEO_HIGH_FRAME_RATE = "pref_camera_hfr_key"; + public static final String KEY_SEE_MORE = "pref_camera_see_more_key"; public static final String KEY_VIDEO_HDR = "pref_camera_video_hdr_key"; public static final String DEFAULT_VIDEO_QUALITY_VALUE = "custom"; public static final String KEY_SKIN_TONE_ENHANCEMENT = "pref_camera_skinToneEnhancement_key"; @@ -123,6 +124,7 @@ public class CameraSettings { 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_SEE_MORE_MODES = "see-more-values"; private static final String KEY_QC_SUPPORTED_CDS_MODES = "cds-mode-values"; private static final String KEY_QC_SUPPORTED_VIDEO_CDS_MODES = "video-cds-mode-values"; private static final String KEY_QC_SUPPORTED_TNR_MODES = "tnr-mode-values"; @@ -146,6 +148,7 @@ public class CameraSettings { public static final String KEY_SNAPCAM_HDR_MODE = "hdr-mode"; public static final String KEY_SNAPCAM_HDR_NEED_1X = "hdr-need-1x"; public static final String KEY_VIDEO_HSR = "video-hsr"; + public static final String KEY_QC_SEE_MORE_MODE = "see-more"; public static final String KEY_INTERNAL_PREVIEW_RESTART = "internal-restart"; public static final String KEY_QC_ZSL_HDR_SUPPORTED = "zsl-hdr-supported"; @@ -283,6 +286,14 @@ public class CameraSettings { return split(str); } + public static List<String> getSupportedSeeMoreModes(Parameters params) { + String str = params.get(KEY_QC_SUPPORTED_SEE_MORE_MODES); + if (str == null) { + return null; + } + return split(str); + } + public static List<String> getSupportedAEBracketingModes(Parameters params) { String str = params.get(KEY_QC_SUPPORTED_AE_BRACKETING_MODES); if (str == null) { @@ -595,9 +606,15 @@ public class CameraSettings { ListPreference cameraHdrPlus = group.findPreference(KEY_CAMERA_HDR_PLUS); ListPreference videoHfrMode = group.findPreference(KEY_VIDEO_HIGH_FRAME_RATE); + ListPreference seeMoreMode = group.findPreference(KEY_SEE_MORE); // Since the screen could be loaded from different resources, we need // to check if the preference is available here + if (seeMoreMode != null) { + filterUnsupportedOptions(group, seeMoreMode, + getSupportedSeeMoreModes(mParameters)); + } + if ((videoHfrMode != null) && (mParameters.getSupportedHfrSizes() == null)) { filterUnsupportedOptions(group, videoHfrMode, null); |