summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CaptureUI.java
diff options
context:
space:
mode:
authorCamera Software Integration <camswint@localhost>2016-11-28 22:18:17 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-11-28 22:18:17 -0800
commit74eb9b04b80f5791ec8c0c7674a42b5f06b92b49 (patch)
tree02258131722203c85e93f1fdcfb86bfc0f49d4b4 /src/com/android/camera/CaptureUI.java
parenta336eeca2ed3235ddffd66cec3cf5e220ddd6641 (diff)
parent27ebaef9c1210ee068c44585c4d6fb648d7e3d7d (diff)
downloadandroid_packages_apps_Snap-74eb9b04b80f5791ec8c0c7674a42b5f06b92b49.tar.gz
android_packages_apps_Snap-74eb9b04b80f5791ec8c0c7674a42b5f06b92b49.tar.bz2
android_packages_apps_Snap-74eb9b04b80f5791ec8c0c7674a42b5f06b92b49.zip
Merge "SnapdragonCamera: Shutter button was disabled after switching to video mode" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/CaptureUI.java')
-rw-r--r--src/com/android/camera/CaptureUI.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java
index 338e7ddd1..d112f9d34 100644
--- a/src/com/android/camera/CaptureUI.java
+++ b/src/com/android/camera/CaptureUI.java
@@ -893,6 +893,15 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
}
}
+ /**
+ * Enables or disables the video button.
+ */
+ public void enableVideo(boolean enabled) {
+ if (mVideoButton != null) {
+ mVideoButton.setEnabled(enabled);
+ }
+ }
+
private boolean handleBackKeyOnMenu() {
if (mFilterMenuStatus == FILTER_MENU_ON) {
removeFilterMenu(true);