summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/VideoUI.java
diff options
context:
space:
mode:
authorJing (Mia) Wang <wangjing@codeaurora.org>2016-09-09 18:20:22 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-09-12 21:56:59 -0700
commit37f54aa329758f0eaa4c3f6f30fbe9f9cd93ecc2 (patch)
tree09f8cfcee477fb2af57bcf91fe0a9f65d4f7dcdb /src/com/android/camera/VideoUI.java
parentdaee7f193c91bee48ce3b12fc7a0e988aa8ce02f (diff)
downloadandroid_packages_apps_Snap-37f54aa329758f0eaa4c3f6f30fbe9f9cd93ecc2.tar.gz
android_packages_apps_Snap-37f54aa329758f0eaa4c3f6f30fbe9f9cd93ecc2.tar.bz2
android_packages_apps_Snap-37f54aa329758f0eaa4c3f6f30fbe9f9cd93ecc2.zip
SnapdragonCamera: Preview button should not work in secure mode
When camera is in secure mode, it will still listen to the preview event although the circle is invisible to the user. So disable the event listener of preview button. Change-Id: Ic4f1dbf32163a7f210e3f4b87599699f44e8f7b0 CRs-Fixed: 1002685
Diffstat (limited to 'src/com/android/camera/VideoUI.java')
-rw-r--r--src/com/android/camera/VideoUI.java21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index 00f3c705a..2aa83c179 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -673,17 +673,18 @@ public class VideoUI implements PieRenderer.PieListener,
mGestures.setRenderOverlay(mRenderOverlay);
- mThumbnail = (ImageView) mRootView.findViewById(R.id.preview_thumb);
- mThumbnail.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- // Do not allow navigation to filmstrip during video recording
- if (!mRecordingStarted && !CameraControls.isAnimating()) {
- mActivity.gotoGallery();
+ if (!mActivity.isSecureCamera()) {
+ mThumbnail = (ImageView) mRootView.findViewById(R.id.preview_thumb);
+ mThumbnail.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ // Do not allow navigation to filmstrip during video recording
+ if (!mRecordingStarted && !CameraControls.isAnimating()) {
+ mActivity.gotoGallery();
+ }
}
- }
- });
-
+ });
+ }
}
public void setPreviewGesturesVideoUI() {