diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-16 18:51:58 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-16 18:51:58 -0800 |
| commit | 3196565b3091f36a00428c0509c2bfd959c84b85 (patch) | |
| tree | 378fb54347ed535fab4fda5ef800ef7260acd2b8 | |
| parent | 8916b47b8b6b98dc7fa8c2aea27fc09a473ed71e (diff) | |
| parent | 097d0a39d4ca7f7b494c08831fa0f9d2d8dd2f43 (diff) | |
| download | android_packages_apps_Snap-3196565b3091f36a00428c0509c2bfd959c84b85.tar.gz android_packages_apps_Snap-3196565b3091f36a00428c0509c2bfd959c84b85.tar.bz2 android_packages_apps_Snap-3196565b3091f36a00428c0509c2bfd959c84b85.zip | |
Merge "SnapdragonCamera:Fix Camera crash when taking picture with flash light on." into camera.lnx.1.0-dev.1.0
| -rw-r--r-- | src/com/android/camera/CaptureUI.java | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java index cc4786f0c..58ecdfb6f 100644 --- a/src/com/android/camera/CaptureUI.java +++ b/src/com/android/camera/CaptureUI.java @@ -487,17 +487,25 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, protected void showCapturedImageForReview(byte[] jpegData, int orientation, boolean mirror) { mDecodeTaskForReview = new CaptureUI.DecodeImageForReview(jpegData, orientation, mirror); mDecodeTaskForReview.execute(); - mPreviewLayout.setVisibility(View.VISIBLE); - CameraUtil.fadeIn(mReviewDoneButton); - CameraUtil.fadeIn(mReviewRetakeButton); + if (getCurrentIntentMode() != CaptureModule.INTENT_MODE_NORMAL) { + mPreviewLayout.setVisibility(View.VISIBLE); + CameraUtil.fadeIn(mReviewDoneButton); + CameraUtil.fadeIn(mReviewRetakeButton); + } } protected void showRecordVideoForReview(Bitmap preview) { - mReviewImage.setImageBitmap(preview); - mPreviewLayout.setVisibility(View.VISIBLE); - mReviewPlayButton.setVisibility(View.VISIBLE); - CameraUtil.fadeIn(mReviewDoneButton); - CameraUtil.fadeIn(mReviewRetakeButton); + if (getCurrentIntentMode() != CaptureModule.INTENT_MODE_NORMAL) { + mReviewImage.setImageBitmap(preview); + mPreviewLayout.setVisibility(View.VISIBLE); + mReviewPlayButton.setVisibility(View.VISIBLE); + CameraUtil.fadeIn(mReviewDoneButton); + CameraUtil.fadeIn(mReviewRetakeButton); + } + } + + private int getCurrentIntentMode() { + return mModule.getCurrentIntentMode(); } private void toggleMakeup() { |