diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-08-04 12:50:34 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-08-21 18:46:32 -0700 |
| commit | e3d36c451e9e66c7786c169248c3a8aa06b67de7 (patch) | |
| tree | 1d1fdc563297db51c912203c40ec29a731ae14bc /src/com/android/camera/VideoModule.java | |
| parent | 9fc9fd41865ae855b5d8bb925b8100a16aa63c3b (diff) | |
| download | android_packages_apps_Snap-e3d36c451e9e66c7786c169248c3a8aa06b67de7.tar.gz android_packages_apps_Snap-e3d36c451e9e66c7786c169248c3a8aa06b67de7.tar.bz2 android_packages_apps_Snap-e3d36c451e9e66c7786c169248c3a8aa06b67de7.zip | |
camera2: Fix merge issues
Change-Id: I9b55bcaaa03e598e57325f45e80ee8493029edf1
Diffstat (limited to 'src/com/android/camera/VideoModule.java')
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 5dc4c219e..5743a70ea 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -2346,7 +2346,6 @@ public class VideoModule implements CameraModule, mActivity.getString(R.string.pref_camera_dis_value_disable)); RotateTextToast.makeText(mActivity, R.string.video_quality_4k_disable_IS, Toast.LENGTH_LONG).show(); - mIsDISEnabled = false; } else { Log.e(TAG, "Not supported IS mode = " + mActivity.getString(R.string.pref_camera_dis_value_disable)); @@ -2532,12 +2531,11 @@ public class VideoModule implements CameraModule, /* Disable CDS */ if (noiseReductionMode.equals( mActivity.getString(R.string.pref_camera_noise_reduction_value_high_quality)) && - video_cds.equals(mActivity.getString(R.string. - pref_camera_video_cds_value_on))) { + video_cds.equals(mActivity.getString(R.string.setting_on))) { mParameters.set(CameraSettings.KEY_QC_VIDEO_CDS_MODE, - mActivity.getString(R.string.pref_camera_video_cds_value_off)); + mActivity.getString(R.string.setting_off)); mUI.overrideSettings(CameraSettings.KEY_QC_VIDEO_CDS_MODE, - mActivity.getString(R.string.pref_camera_video_cds_value_off)); + mActivity.getString(R.string.setting_off)); Toast.makeText(mActivity, R.string.disable_CDS_during_HighQualityNoiseReduction, Toast.LENGTH_LONG).show(); } @@ -2545,12 +2543,11 @@ public class VideoModule implements CameraModule, /* Disable TNR */ if (noiseReductionMode.equals( mActivity.getString(R.string.pref_camera_noise_reduction_value_high_quality)) && - video_tnr.equals(mActivity.getString(R.string. - pref_camera_video_tnr_value_on))) { + video_tnr.equals(mActivity.getString(R.string.setting_on))) { mParameters.set(CameraSettings.KEY_QC_VIDEO_TNR_MODE, - mActivity.getString(R.string.pref_camera_video_tnr_value_off)); + mActivity.getString(R.string.setting_off)); mUI.overrideSettings(CameraSettings.KEY_QC_VIDEO_TNR_MODE, - mActivity.getString(R.string.pref_camera_video_tnr_value_off)); + mActivity.getString(R.string.setting_off)); Toast.makeText(mActivity, R.string.disable_TNR_during_HighQualityNoiseReduction, Toast.LENGTH_LONG).show(); } |