diff options
| -rw-r--r-- | src/com/android/camera/VideoMenu.java | 10 | ||||
| -rwxr-xr-x | src/com/android/camera/VideoModule.java | 8 |
2 files changed, 13 insertions, 5 deletions
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java index 670572774..c44a04b94 100644 --- a/src/com/android/camera/VideoMenu.java +++ b/src/com/android/camera/VideoMenu.java @@ -90,6 +90,9 @@ public class VideoMenu extends MenuController private static final int CLICK_THRESHOLD = 200; private int previewMenuSize; + private static final boolean PERSIST_4K_NO_LIMIT = + android.os.SystemProperties.getBoolean("persist.camcorder.4k.nolimit", false); + public VideoMenu(CameraActivity activity, VideoUI ui) { super(activity); mUI = ui; @@ -683,11 +686,12 @@ public class VideoMenu extends MenuController } } private void overrideMenuFor4K() { - if(mUI.is4KEnabled()) { + if(mUI.is4KEnabled() && !PERSIST_4K_NO_LIMIT) { + mListMenu.setPreferenceEnabled( - CameraSettings.KEY_DIS,false); + CameraSettings.KEY_DIS,false); mListMenu.overrideSettings( - CameraSettings.KEY_DIS, "disable"); + CameraSettings.KEY_DIS, "disable"); mListMenu.setPreferenceEnabled( CameraSettings.KEY_SEE_MORE, false); diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index e9985e8e7..ab576acb6 100755 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -216,6 +216,9 @@ public class VideoModule implements CameraModule, private boolean mFaceDetectionEnabled = false; private boolean mFaceDetectionStarted = false; + private static final boolean PERSIST_4K_NO_LIMIT = + android.os.SystemProperties.getBoolean("persist.camcorder.4k.nolimit", false); + private final MediaSaveService.OnMediaSavedListener mOnVideoSavedListener = new MediaSaveService.OnMediaSavedListener() { @Override @@ -2223,7 +2226,7 @@ public class VideoModule implements CameraModule, Log.v(TAG, "DIS value =" + disMode); mIsDISEnabled = disMode.equals("enable"); - if (is4KEnabled()) { + if (is4KEnabled() && !PERSIST_4K_NO_LIMIT) { if (isSupported(mActivity.getString(R.string.pref_camera_dis_value_disable), CameraSettings.getSupportedDISModes(mParameters))) { mParameters.set(CameraSettings.KEY_QC_DIS_MODE, @@ -2698,7 +2701,8 @@ public class VideoModule implements CameraModule, @Override public void onSharedPreferenceChanged(ListPreference pref) { - if (pref != null && CameraSettings.KEY_VIDEO_QUALITY.equals(pref.getKey())) { + if (pref != null && CameraSettings.KEY_VIDEO_QUALITY.equals(pref.getKey()) + && !PERSIST_4K_NO_LIMIT) { String videoQuality = pref.getValue(); if (CameraSettings.VIDEO_QUALITY_TABLE.containsKey(videoQuality)) { int quality = CameraSettings.VIDEO_QUALITY_TABLE.get(videoQuality); |