summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-06-06 21:06:23 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2014-06-06 21:06:23 -0700
commitbdb686751bc5deaaf4db740ed4ebce13408e53e2 (patch)
treead2206b0f69e82b05ecf700df4d49c6ad8e013e3 /src
parenta8ff1d2afa98967e3406b66bb4992f63ab65b0f9 (diff)
parent8479316637e8c4aa620c9c5bd6abb347885e1af2 (diff)
downloadandroid_packages_apps_Snap-bdb686751bc5deaaf4db740ed4ebce13408e53e2.tar.gz
android_packages_apps_Snap-bdb686751bc5deaaf4db740ed4ebce13408e53e2.tar.bz2
android_packages_apps_Snap-bdb686751bc5deaaf4db740ed4ebce13408e53e2.zip
Merge "Camera2: disable the shutter button when not previewing"
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/VideoModule.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index a84b6ff5a..4b83be13c 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -1000,6 +1000,7 @@ public class VideoModule implements CameraModule,
mCameraDevice.stopPreview();
mPreviewing = false;
mStopPrevPending = false;
+ mUI.enableShutter(false);
}
private void closeCamera() {