summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-02-06 11:06:52 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2015-02-06 11:06:52 -0800
commit926948487fb81d0971c359e2cd7a4b02a0741403 (patch)
treea31f66ebcef3edbf1ac799d0c816641aac1dfd0b
parent5e266938aac08975bbe198915adda22cc59ffebe (diff)
parent11812e34565ededb74b0d6c8868f8c1892264420 (diff)
downloadandroid_packages_apps_Snap-926948487fb81d0971c359e2cd7a4b02a0741403.tar.gz
android_packages_apps_Snap-926948487fb81d0971c359e2cd7a4b02a0741403.tar.bz2
android_packages_apps_Snap-926948487fb81d0971c359e2cd7a4b02a0741403.zip
Merge "SnapdragonCamera: Improve app stop latency"
-rw-r--r--src/com/android/camera/VideoModule.java5
-rw-r--r--src/com/android/camera/VideoUI.java5
2 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index e200de1bd..75d3f221d 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -96,7 +96,7 @@ public class VideoModule implements CameraModule,
private static final int SCREEN_DELAY = 2 * 60 * 1000;
- private static final long SHUTTER_BUTTON_TIMEOUT = 500L; // 500ms
+ private static final long SHUTTER_BUTTON_TIMEOUT = 0L; // 0ms
/**
* An unpublished intent flag requesting to start recording straight away
@@ -688,12 +688,13 @@ public class VideoModule implements CameraModule,
if (isRecorderReady() == false)
return;
+ mUI.enableShutter(false);
+
if (stop) {
onStopVideoRecording();
} else {
startVideoRecording();
}
- mUI.enableShutter(false);
// Keep the shutter button disabled when in video capture intent
// mode and recording is stopped. It'll be re-enabled when
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index 13db502c5..db2fdb900 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -822,6 +822,11 @@ public class VideoUI implements PieRenderer.PieListener,
public void enableShutter(boolean enable) {
if (mShutterButton != null) {
+ if (enable) {
+ Log.v(TAG, "Shutter Button enabled !!");
+ } else {
+ Log.v(TAG, "Shutter Button disabled !!");
+ }
mShutterButton.setEnabled(enable);
}
}