summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/SettingsManager.java
diff options
context:
space:
mode:
authorByunghun Jeon <bjeon@codeaurora.org>2016-06-17 15:52:25 -0700
committerByunghun Jeon <bjeon@codeaurora.org>2016-06-29 17:13:44 -0700
commitb5821430f199a516c4b3181b63609a264e613719 (patch)
tree617ba411d8950820e74560d1035a6d1f04e8b450 /src/com/android/camera/SettingsManager.java
parent792e60ced545933f88726632d9fd6ba2e675d6cf (diff)
downloadandroid_packages_apps_Snap-b5821430f199a516c4b3181b63609a264e613719.tar.gz
android_packages_apps_Snap-b5821430f199a516c4b3181b63609a264e613719.tar.bz2
android_packages_apps_Snap-b5821430f199a516c4b3181b63609a264e613719.zip
SnapdragonCamera: Allow take snapshot while recording video
Allow take snapshot while recording video by showing shutter button. Directly call capture when shutter button is pressed. Change-Id: Iae4d42d8878ea82b459ec67709b0ad8e340c8226 CRs-Fixed: 1028463
Diffstat (limited to 'src/com/android/camera/SettingsManager.java')
-rw-r--r--src/com/android/camera/SettingsManager.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java
index 9b229d97d..5dbda0af3 100644
--- a/src/com/android/camera/SettingsManager.java
+++ b/src/com/android/camera/SettingsManager.java
@@ -104,6 +104,7 @@ public class SettingsManager implements ListMenu.SettingsListener {
public static final String KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL =
"pref_camera2_video_time_lapse_frame_interval_key";
public static final String KEY_FACE_DETECTION = "pref_camera2_facedetection_key";
+ public static final String KEY_AUTO_VIDEOSNAP_SIZE = "pref_camera2_videosnap_key";
private static final String TAG = "SnapCam_SettingsManager";
private static SettingsManager sInstance;
@@ -727,6 +728,12 @@ public class SettingsManager implements ListMenu.SettingsListener {
return res;
}
+ public Size[] getSupportedOutputSize(int cameraId, int format) {
+ StreamConfigurationMap map = mCharacteristics.get(cameraId).get(
+ CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
+ return map.getOutputSizes(format);
+ }
+
public Size[] getSupportedOutputSize(int cameraId, Class cl) {
StreamConfigurationMap map = mCharacteristics.get(cameraId).get(
CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);