diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2019-05-29 01:30:28 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-05-29 01:30:28 -0700 |
commit | 4d78ecad74b5f74f34c82ac83ff712887d41fc09 (patch) | |
tree | 9788709c9b41e5d7d26064489ddd43151a59c60c /src | |
parent | 83b100e3a0b01e6d097a2169e7703c79e66877da (diff) | |
parent | eaa8efc86ce4b8cc80c5ecba9f952781b1af2df9 (diff) | |
download | android_packages_apps_Snap-4d78ecad74b5f74f34c82ac83ff712887d41fc09.tar.gz android_packages_apps_Snap-4d78ecad74b5f74f34c82ac83ff712887d41fc09.tar.bz2 android_packages_apps_Snap-4d78ecad74b5f74f34c82ac83ff712887d41fc09.zip |
Merge "disable settings during recording" into camera-SnapdragonCamera.lnx.2.0
Diffstat (limited to 'src')
-rwxr-xr-x | src/com/android/camera/CaptureModule.java | 2 | ||||
-rwxr-xr-x | src/com/android/camera/CaptureUI.java | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 3ef207086..a06acf84f 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -5353,6 +5353,7 @@ public class CaptureModule implements CameraModule, PhotoController, if(mFrameProcessor != null) { mFrameProcessor.onOpen(getFrameProcFilterId(), mPreviewSize); } + mUI.showUIafterRecording(); boolean changed = mUI.setPreviewSize(mPreviewSize.getWidth(), mPreviewSize.getHeight()); if (changed) { mUI.hideSurfaceView(); @@ -5361,7 +5362,6 @@ public class CaptureModule implements CameraModule, PhotoController, if (!mPaused) { createSessions(); } - mUI.showUIafterRecording(); mUI.resetTrackingFocus(); mStopRecPending = false; } diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java index ce520dd7e..dcfd74b6e 100755 --- a/src/com/android/camera/CaptureUI.java +++ b/src/com/android/camera/CaptureUI.java @@ -246,13 +246,12 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, private void previewUIReady() { if((mSurfaceHolder != null && mSurfaceHolder.getSurface().isValid())) { mModule.onPreviewUIReady(); - if ((mIsVideoUI || mModule.getCurrentIntentMode() != CaptureModule.INTENT_MODE_NORMAL) + if (mModule.getCurrentIntentMode() != CaptureModule.INTENT_MODE_NORMAL && mThumbnail != null){ mThumbnail.setVisibility(View.INVISIBLE); mThumbnail = null; mActivity.updateThumbnail(mThumbnail); - } else if (!mIsVideoUI && - mModule.getCurrentIntentMode() == CaptureModule.INTENT_MODE_NORMAL){ + } else if (mModule.getCurrentIntentMode() == CaptureModule.INTENT_MODE_NORMAL){ if (mThumbnail == null) mThumbnail = (ImageView) mRootView.findViewById(R.id.preview_thumb); mActivity.updateThumbnail(mThumbnail); @@ -766,7 +765,8 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, } public void openSettingsMenu() { - if (mPreviewLayout != null && mPreviewLayout.getVisibility() == View.VISIBLE) { + if ((mPreviewLayout != null && mPreviewLayout.getVisibility() == View.VISIBLE) || + mIsVideoUI) { return; } clearFocus(); @@ -1913,7 +1913,6 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, mSurfaceView.getHolder().setFixedSize(mPreviewWidth, mPreviewHeight); mSurfaceView.setAspectRatio(mPreviewHeight, mPreviewWidth); mSurfaceView.setVisibility(View.VISIBLE); - mIsVideoUI = false; } public boolean setPreviewSize(int width, int height) { |