diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-09-26 17:36:10 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-26 17:36:10 -0700 |
| commit | aee79a802c9606d16d562b47e6c629967a5047da (patch) | |
| tree | 4b18a5304f6f75619e1e472e56193e206d3e61a6 /src/com/android/camera/VideoUI.java | |
| parent | b10b4edda7a132a729db8706c33615328407a747 (diff) | |
| parent | 37f54aa329758f0eaa4c3f6f30fbe9f9cd93ecc2 (diff) | |
| download | android_packages_apps_Snap-aee79a802c9606d16d562b47e6c629967a5047da.tar.gz android_packages_apps_Snap-aee79a802c9606d16d562b47e6c629967a5047da.tar.bz2 android_packages_apps_Snap-aee79a802c9606d16d562b47e6c629967a5047da.zip | |
Merge "SnapdragonCamera: Preview button should not work in secure mode" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/VideoUI.java')
| -rw-r--r-- | src/com/android/camera/VideoUI.java | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java index 2ecf9e140..6ee532dbf 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java @@ -677,17 +677,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() { |