diff options
| author | Dimitar Borisov <dboris@codeaurora.org> | 2014-10-06 18:38:12 +0300 |
|---|---|---|
| committer | Susmitha Gummalla <vgummall@codeaurora.org> | 2014-10-14 16:52:30 -0700 |
| commit | a5c2a74498b9bec02aa842124b43d7dc6d229a4e (patch) | |
| tree | c73d641e269e74bb4e214582d1d92dd9135d9fca /src | |
| parent | d7810337255f08f3c89e2fb02ca393fc2997ca8d (diff) | |
| download | android_packages_apps_Snap-a5c2a74498b9bec02aa842124b43d7dc6d229a4e.tar.gz android_packages_apps_Snap-a5c2a74498b9bec02aa842124b43d7dc6d229a4e.tar.bz2 android_packages_apps_Snap-a5c2a74498b9bec02aa842124b43d7dc6d229a4e.zip | |
SnapdragonCamera: IS is disabled when 4k video quality is enabled
- IS is disabled when 4k video quality is enabled
CRs-Fixed: 733839
Change-Id: Iaaaa779bab0fbd7f9e5e5be08c6ada1c67ceb17a
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/camera/VideoModule.java | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 226e50398..7bb7ece78 100755 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -1934,9 +1934,27 @@ public class VideoModule implements CameraModule, 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); + + if (is4KEnabled()) { + if (isSupported(mActivity.getString(R.string.pref_camera_dis_value_disable), + CameraSettings.getSupportedDISModes(mParameters))) { + mParameters.set(CameraSettings.KEY_QC_DIS_MODE, + mActivity.getString(R.string.pref_camera_dis_value_disable)); + mUI.overrideSettings(CameraSettings.KEY_DIS, + mActivity.getString(R.string.pref_camera_dis_value_disable)); + Toast.makeText(mActivity, R.string.video_quality_4k_disable_IS, + Toast.LENGTH_LONG).show(); + } else { + Log.e(TAG, "Not supported IS mode = " + + mActivity.getString(R.string.pref_camera_dis_value_disable)); + } + } else { + if (isSupported(disMode, + CameraSettings.getSupportedDISModes(mParameters))) { + mParameters.set(CameraSettings.KEY_QC_DIS_MODE, disMode); + } else { + Log.e(TAG, "Not supported IS mode = " + disMode); + } } if (mDefaultAntibanding == null) { |