diff options
| -rw-r--r-- | res/values/qcomarrays.xml | 4 | ||||
| -rw-r--r-- | res/values/qcomstrings.xml | 3 | ||||
| -rwxr-xr-x | res/values/strings.xml | 4 | ||||
| -rwxr-xr-x | src/com/android/camera/VideoModule.java | 24 |
4 files changed, 30 insertions, 5 deletions
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml index 9f879ceed..98329c3bf 100644 --- a/res/values/qcomarrays.xml +++ b/res/values/qcomarrays.xml @@ -272,8 +272,8 @@ <!-- Do not localize entryvalues --> <string-array name="pref_camera_dis_entryvalues"> - <item>disable</item> - <item>enable</item> + <item>@string/pref_camera_dis_value_disable</item> + <item>@string/pref_camera_dis_value_enable</item> </string-array> <!-- Face Recognition dialog box entries --> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 9cd10d24f..8f2368e6e 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -423,6 +423,9 @@ <string name="pref_camera_dis_entry_off">Off</string> <string name="pref_camera_dis_entry_on">On</string> + <string name="pref_camera_dis_value_disable">disable</string> + <string name="pref_camera_dis_value_enable">enable</string> + <!-- Select Face Recognition title --> <string name="pref_camera_facerc_title">Face Recognition</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index fe0f73586..d597e5af0 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -422,9 +422,13 @@ <!-- Toast after enable HDR function to inform Continuous Shot has disabled --> <string name="HDR_disable_continuous_shot">Enable HDR will disable Continuous Shot.</string> + <!-- Toast after enable Advanced Capture function to inform Continuous Shot has disabled --> <string name="advanced_capture_disable_continuous_shot">Enable Advanced Capture will disable Continuous Shot.</string> + <!-- Toast after enable 2k4k video quality to inform IS has disabled --> + <string name="video_quality_4k_disable_IS">Enable 4k video quality will disable IS.</string> + <!-- Exposure settings in preference --> <string name="pref_exposure_title">Exposure</string> <string name="pref_exposure_default" translatable="false">0</string> 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) { |