summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/values/strings.xml2
-rw-r--r--src/com/android/camera/VideoModule.java8
2 files changed, 9 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 538087348..b9502322a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -238,6 +238,8 @@
<!-- The Video quality settings in preference [CHAR LIMIT=21] -->
<string name="pref_video_quality_title">Video quality</string>
+ <!-- The default quality value is NULL -->
+ <string name="pref_video_quality_default" translatable="false"></string>
<!-- Video quality setting entry.
Videos will be recorded in 4k DCI quality. [CHAR LIMIT=24] -->
<string name="pref_video_quality_entry_4kdci" translatable="false">
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index ed2fd3aef..2b6d0c449 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -780,10 +780,16 @@ public class VideoModule implements CameraModule,
null);
if (videoQuality == null) {
mParameters = mCameraDevice.getParameters();
+ String defaultQuality = mActivity.getResources().getString(
+ R.string.pref_video_quality_default);
+ if (!defaultQuality.equals("")){
+ videoQuality = defaultQuality;
+ } else {
// check for highest quality supported
videoQuality = CameraSettings.getSupportedHighestVideoQuality(
mCameraId, mParameters);
- mPreferences.edit().putString(CameraSettings.KEY_VIDEO_QUALITY, videoQuality);
+ }
+ mPreferences.edit().putString(CameraSettings.KEY_VIDEO_QUALITY, videoQuality).apply();
}
int quality = CameraSettings.VIDEO_QUALITY_TABLE.get(videoQuality);