From 413e9bd770cbd868929d6c09318b54620c059169 Mon Sep 17 00:00:00 2001 From: Danny Baumann Date: Sat, 28 Jan 2017 13:35:40 +0100 Subject: Fix thumbnail sometimes not being shown initially in video mode. Happened due to a race condition between surface creation and view initialization. Change-Id: I701eaa16c09a246806f5d148d0ce90f1d132e3f3 (cherry picked from commit 9936197ae3607b0fec5eb343725d6056b6d86b67) --- src/com/android/camera/VideoUI.java | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java index 029dda9f5..0b5197063 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java @@ -202,6 +202,19 @@ public class VideoUI extends BaseUI implements PieRenderer.PieListener, } }); + 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 && !isCameraControlsAnimating()) { + mActivity.gotoGallery(); + } + } + }); + } + mRenderOverlay = (RenderOverlay) mRootView.findViewById(R.id.render_overlay); mFocusRing = (FocusRing) mRootView.findViewById(R.id.focus_ring); mShutterButton = (ShutterButton) mRootView.findViewById(R.id.shutter_button); @@ -529,19 +542,6 @@ public class VideoUI extends BaseUI implements PieRenderer.PieListener, initializeZoom(params); mActivity.setPreviewGestures(mGestures); - - 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 && !isCameraControlsAnimating()) { - mActivity.gotoGallery(); - } - } - }); - } } public boolean isCameraControlsAnimating() { -- cgit v1.2.3