diff options
author | Alok Kediya <kediya@codeaurora.org> | 2013-09-28 17:12:35 +0530 |
---|---|---|
committer | Linux Build Service Account <lnxbuild@localhost> | 2013-10-31 19:39:35 -0600 |
commit | d8887ed7c40a161431c6b4db32dddcb46859692f (patch) | |
tree | b1063bba921681c8a0894c423abbb200accdc5c7 /src/com/android/camera/CameraSettings.java | |
parent | 28c3196d6ecc29322d15b0f6f46ceba8af2244ac (diff) | |
download | android_packages_apps_Snap-d8887ed7c40a161431c6b4db32dddcb46859692f.tar.gz android_packages_apps_Snap-d8887ed7c40a161431c6b4db32dddcb46859692f.tar.bz2 android_packages_apps_Snap-d8887ed7c40a161431c6b4db32dddcb46859692f.zip |
Camera: Add support for raw snapshot
Previously picture format only have option for jpeg and raw,
but detailed raw image format is misssing from menu to choose.
Also, changes to save raw image to coorect path
are included.
(cherrypicked from commit c0028f9dbe178c3fed1bcb4af96eb0db4d2e2973)
Change-Id: Ifab7fd80e4a83370b2dc6932340005a06cc3552f
(cherry picked from commit 27f9245f35d0284c17d8d2fdf5576ea3879e7d33)
(cherry picked from commit 3c66703af119c06697f16303fadadbe956646cb3)
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
-rw-r--r-- | src/com/android/camera/CameraSettings.java | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 7d90a0689..4e824775b 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -104,6 +104,7 @@ public class CameraSettings { private static final String KEY_QC_SUPPORTED_FACE_RECOGNITION_MODES = "face-recognition-values"; public static final String KEY_QC_AE_BRACKETING = "ae-bracket-hdr"; public static final String KEY_QC_FACE_RECOGNITION = "face-recognition"; + private static final String KEY_QC_PICTURE_FORMAT = "picture-format-values"; private static final String VIDEO_QUALITY_HIGH = "high"; private static final String VIDEO_QUALITY_MMS = "mms"; private static final String VIDEO_QUALITY_YOUTUBE = "youtube"; @@ -231,6 +232,13 @@ public class CameraSettings { } return substrings; } + private List<String> getSupportedPictureFormatLists() { + String str = mParameters.get(KEY_QC_PICTURE_FORMAT); + if (str == null) { + str = "jpeg,raw"; // if not set, fall back to default behavior + } + return split(str); + } private void qcomInitPreferences(PreferenceGroup group){ //Qcom Preference add here ListPreference powerMode = group.findPreference(KEY_POWER_MODE); @@ -254,7 +262,7 @@ public class CameraSettings { ListPreference jpegQuality = group.findPreference(KEY_JPEG_QUALITY); ListPreference videoSnapSize = group.findPreference(KEY_VIDEO_SNAPSHOT_SIZE); ListPreference videoHdr = group.findPreference(KEY_VIDEO_HDR); - + ListPreference pictureFormat = group.findPreference(KEY_PICTURE_FORMAT); if (touchAfAec != null) { filterUnsupportedOptions(group, @@ -324,6 +332,11 @@ public class CameraSettings { histogram, mParameters.getSupportedHistogramModes()); } + if (pictureFormat!= null) { + filterUnsupportedOptions(group, + pictureFormat, getSupportedPictureFormatLists()); + } + } private void initPreference(PreferenceGroup group) { ListPreference videoQuality = group.findPreference(KEY_VIDEO_QUALITY); |