diff options
| -rw-r--r-- | res/xml/video_preferences.xml | 6 | ||||
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 21 | ||||
| -rw-r--r-- | src/com/android/camera/VideoMenu.java | 1 | ||||
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 9 |
4 files changed, 36 insertions, 1 deletions
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml index af9e8501b..ab876b81c 100644 --- a/res/xml/video_preferences.xml +++ b/res/xml/video_preferences.xml @@ -97,6 +97,12 @@ camera:entries="@array/pref_camera_powermode_entries" camera:entryValues="@array/pref_camera_powermode_entryvalues" /> <ListPreference + camera:key="pref_camera_dis_key" + camera:defaultValue="@string/pref_camera_dis_default" + camera:title="@string/pref_camera_dis_title" + camera:entries="@array/pref_camera_dis_entries" + camera:entryValues="@array/pref_camera_dis_entryvalues" /> + <ListPreference camera:key="pref_camera_coloreffect_key" camera:defaultValue="@string/pref_camera_coloreffect_default" camera:title="@string/pref_camera_coloreffect_title" diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 352e34dda..74877541d 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -100,10 +100,14 @@ public class CameraSettings { public static final String KEY_SKIN_TONE_ENHANCEMENT_FACTOR = "pref_camera_skinToneEnhancement_factor_key"; public static final String KEY_FACE_RECOGNITION = "pref_camera_facerc_key"; + public static final String KEY_DIS = "pref_camera_dis_key"; + private static final String KEY_QC_SUPPORTED_AE_BRACKETING_MODES = "ae-bracket-hdr-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"; public static final String KEY_QC_AE_BRACKETING = "ae-bracket-hdr"; public static final String KEY_QC_FACE_RECOGNITION = "face-recognition"; + public static final String KEY_QC_DIS_MODE = "dis"; //for flip public static final String KEY_QC_PREVIEW_FLIP = "preview-flip"; @@ -223,6 +227,15 @@ public class CameraSettings { } return split(str); } + + public static List<String> getSupportedDISModes(Parameters params) { + String str = params.get(KEY_QC_SUPPORTED_DIS_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) { @@ -379,7 +392,9 @@ public class CameraSettings { group.findPreference(KEY_VIDEOCAMERA_FLASH_MODE); ListPreference videoEffect = group.findPreference(KEY_VIDEO_EFFECT); ListPreference cameraHdr = group.findPreference(KEY_CAMERA_HDR); - ListPreference cameraHdrPlus = group.findPreference(KEY_CAMERA_HDR_PLUS); + ListPreference cameraHq = group.findPreference(KEY_CAMERA_HQ); + ListPreference disMode = group.findPreference(KEY_DIS); + // Since the screen could be loaded from different resources, we need // to check if the preference is available here @@ -405,6 +420,10 @@ public class CameraSettings { filterUnsupportedOptions(group, flashMode, mParameters.getSupportedFlashModes()); } + if (disMode != null) { + filterUnsupportedOptions(group, + disMode, getSupportedDISModes(mParameters)); + } if (focusMode != null) { if (!CameraUtil.isFocusAreaSupported(mParameters)) { filterUnsupportedOptions(group, diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java index 03196020c..01b9ddbc4 100644 --- a/src/com/android/camera/VideoMenu.java +++ b/src/com/android/camera/VideoMenu.java @@ -64,6 +64,7 @@ public class VideoMenu extends PieController PieItem item = null; // settings popup mOtherKeys1 = new String[] { + CameraSettings.KEY_DIS, CameraSettings.KEY_VIDEO_EFFECT, CameraSettings.KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL, CameraSettings.KEY_VIDEO_QUALITY, diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 0604e8989..28d290594 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -1633,6 +1633,15 @@ public class VideoModule implements CameraModule, mParameters.setColorEffect(colorEffect); } + String disMode = mPreferences.getString( + CameraSettings.KEY_DIS, + mActivity.getString(R.string.pref_camera_dis_default)); + Log.v(TAG, "DIS value =" + disMode); + if (isSupported(disMode, + CameraSettings.getSupportedDISModes(mParameters))) { + mParameters.set(CameraSettings.KEY_QC_DIS_MODE, disMode); + } + mUnsupportedHFRVideoSize = false; mUnsupportedHFRVideoCodec = false; // To set preview format as YV12 , run command |