summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/VideoModule.java
diff options
context:
space:
mode:
authorSanjeev Garg <sangarg@codeaurora.org>2015-09-21 11:43:26 +0530
committerSanjeev Garg <sangarg@codeaurora.org>2015-09-21 11:43:26 +0530
commit328b589f23ffd70cc8ee52b3a4ed796965719639 (patch)
treef2750349011f2dd28c142d5831f4e0ed82fb05e9 /src/com/android/camera/VideoModule.java
parent465c11e451e18b7f3e8109fdbbc56b866f7f8a56 (diff)
downloadandroid_packages_apps_Snap-328b589f23ffd70cc8ee52b3a4ed796965719639.tar.gz
android_packages_apps_Snap-328b589f23ffd70cc8ee52b3a4ed796965719639.tar.bz2
android_packages_apps_Snap-328b589f23ffd70cc8ee52b3a4ed796965719639.zip
SnapdragonCamera: Enable SeeMore option for 4k.
Currently SeeMore option for 4k recording is disabled. As per requirements, enabling the same. Change-Id: I69e84e0c20c199d80fc819f8aa6be62605bfbd79
Diffstat (limited to 'src/com/android/camera/VideoModule.java')
-rw-r--r--src/com/android/camera/VideoModule.java63
1 files changed, 26 insertions, 37 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 2bd5e1584..30eda4b4d 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -2221,45 +2221,34 @@ public class VideoModule implements CameraModule,
if (isSupported(seeMoreMode,
CameraSettings.getSupportedSeeMoreModes(mParameters))) {
- if (is4KEnabled() && seeMoreMode.equals(mActivity.getString(R.string.
- pref_camera_see_more_value_on))) {
- /* Disable SeeMore during 4K resolution */
- mParameters.set(CameraSettings.KEY_QC_SEE_MORE_MODE,
- mActivity.getString(R.string.pref_camera_see_more_value_off));
- mUI.overrideSettings(CameraSettings.KEY_SEE_MORE,
- mActivity.getString(R.string.pref_camera_see_more_value_off));
- Toast.makeText(mActivity, R.string.video_quality_4k_disable_SeeMore,
- Toast.LENGTH_LONG).show();
- } else {
- /* Disable CDS */
- if (seeMoreMode.equals(
- mActivity.getString(R.string.pref_camera_see_more_value_on)) &&
- video_cds.equals(mActivity.getString(R.string.
- pref_camera_video_cds_value_on))) {
- mParameters.set(CameraSettings.KEY_QC_VIDEO_CDS_MODE,
- mActivity.getString(R.string.pref_camera_video_cds_value_off));
- mUI.overrideSettings(CameraSettings.KEY_QC_VIDEO_CDS_MODE,
- mActivity.getString(R.string.pref_camera_video_cds_value_off));
- Toast.makeText(mActivity, R.string.disable_CDS_during_SeeMore,
- Toast.LENGTH_LONG).show();
- }
-
- /* Disable TNR */
- if (seeMoreMode.equals(
- mActivity.getString(R.string.pref_camera_see_more_value_on)) &&
- video_tnr.equals(mActivity.getString(R.string.
- pref_camera_video_tnr_value_on))) {
- mParameters.set(CameraSettings.KEY_QC_VIDEO_TNR_MODE,
- mActivity.getString(R.string.pref_camera_video_tnr_value_off));
- mUI.overrideSettings(CameraSettings.KEY_QC_VIDEO_TNR_MODE,
- mActivity.getString(R.string.pref_camera_video_tnr_value_off));
- Toast.makeText(mActivity, R.string.disable_TNR_during_SeeMore,
- Toast.LENGTH_LONG).show();
- }
+ /* Disable CDS */
+ if (seeMoreMode.equals(
+ mActivity.getString(R.string.pref_camera_see_more_value_on)) &&
+ video_cds.equals(mActivity.getString(R.string.
+ pref_camera_video_cds_value_on))) {
+ mParameters.set(CameraSettings.KEY_QC_VIDEO_CDS_MODE,
+ mActivity.getString(R.string.pref_camera_video_cds_value_off));
+ mUI.overrideSettings(CameraSettings.KEY_QC_VIDEO_CDS_MODE,
+ mActivity.getString(R.string.pref_camera_video_cds_value_off));
+ Toast.makeText(mActivity, R.string.disable_CDS_during_SeeMore,
+ Toast.LENGTH_LONG).show();
+ }
- /* Set SeeMore mode */
- mParameters.set(CameraSettings.KEY_QC_SEE_MORE_MODE, seeMoreMode);
+ /* Disable TNR */
+ if (seeMoreMode.equals(
+ mActivity.getString(R.string.pref_camera_see_more_value_on)) &&
+ video_tnr.equals(mActivity.getString(R.string.
+ pref_camera_video_tnr_value_on))) {
+ mParameters.set(CameraSettings.KEY_QC_VIDEO_TNR_MODE,
+ mActivity.getString(R.string.pref_camera_video_tnr_value_off));
+ mUI.overrideSettings(CameraSettings.KEY_QC_VIDEO_TNR_MODE,
+ mActivity.getString(R.string.pref_camera_video_tnr_value_off));
+ Toast.makeText(mActivity, R.string.disable_TNR_during_SeeMore,
+ Toast.LENGTH_LONG).show();
}
+
+ /* Set SeeMore mode */
+ mParameters.set(CameraSettings.KEY_QC_SEE_MORE_MODE, seeMoreMode);
}
// Set Video HDR.