summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/VideoModule.java
diff options
context:
space:
mode:
authorSenpo Hu <senpo@google.com>2014-08-08 13:42:13 -0700
committerSenpo Hu <senpo@google.com>2014-08-12 17:13:24 -0700
commit111863182bcc4b99bdaa727304d5800fc91dfd51 (patch)
tree4504b142b554e639911dd44954f62d2165725710 /src/com/android/camera/VideoModule.java
parent2307b60abdf0af8639d71ba53cf10fdaf8dfe7e7 (diff)
downloadandroid_packages_apps_Camera2-111863182bcc4b99bdaa727304d5800fc91dfd51.tar.gz
android_packages_apps_Camera2-111863182bcc4b99bdaa727304d5800fc91dfd51.tar.bz2
android_packages_apps_Camera2-111863182bcc4b99bdaa727304d5800fc91dfd51.zip
Enable 4K video for Shamu.
- Add a new resolution setting for back camera video: "UHD 4K" Bug: 16206549 Change-Id: I0b72f8100bc26b556099ad08e093273ccda0f25d
Diffstat (limited to 'src/com/android/camera/VideoModule.java')
-rw-r--r--src/com/android/camera/VideoModule.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index ae0daaf22..c70f6e7f0 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -1351,6 +1351,7 @@ public class VideoModule extends CameraModule
mUI.showRecordingUI(true);
setFocusParameters();
+
updateRecordingTime();
mActivity.enableKeepScreenOn(true);
}
@@ -1628,6 +1629,8 @@ public class VideoModule extends CameraModule
mFocusManager.overrideFocusMode(null);
}
} else {
+ // FIXME(b/16984793): This is broken. For some reasons, CONTINUOUS_PICTURE is not on
+ // when preview starts.
mFocusManager.overrideFocusMode(null);
if (mCameraCapabilities.supports(CameraCapabilities.FocusMode.CONTINUOUS_PICTURE)) {
mCameraSettings.setFocusMode(