SnapdragonCamera: fix filter menu showed in review

When camera is called by 3rd-party app and color filter
menu is showed, the menu will not be closed after
capture and preview is showed,add a judgement to close
it.

Change-Id: I79e254721a56abf190ce979fb84b62c08128498a
CRs-Fixed: 2008844

1 files changed, 6 insertions, 0 deletions

diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java
index 58ecdfb6f..c0be9b77f 100644..100755
--- a/src/com/android/camera/CaptureUI.java
+++ b/src/com/android/camera/CaptureUI.java
@@ -488,6 +488,9 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
         mDecodeTaskForReview = new CaptureUI.DecodeImageForReview(jpegData, orientation, mirror);
         mDecodeTaskForReview.execute();
         if (getCurrentIntentMode() != CaptureModule.INTENT_MODE_NORMAL) {
+            if (mFilterMenuStatus == FILTER_MENU_ON) {
+                removeFilterMenu(false);
+            }
             mPreviewLayout.setVisibility(View.VISIBLE);
             CameraUtil.fadeIn(mReviewDoneButton);
             CameraUtil.fadeIn(mReviewRetakeButton);
@@ -496,6 +499,9 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
 
     protected void showRecordVideoForReview(Bitmap preview) {
         if (getCurrentIntentMode() != CaptureModule.INTENT_MODE_NORMAL) {
+            if (mFilterMenuStatus == FILTER_MENU_ON) {
+                removeFilterMenu(false);
+            }
             mReviewImage.setImageBitmap(preview);
             mPreviewLayout.setVisibility(View.VISIBLE);
             mReviewPlayButton.setVisibility(View.VISIBLE);