SnapdragonCamera: Hide camera controllers when review captured image

The camera settings options including scene mode, color effect,
switcher for back/front camera, and the beautification make-up
should only be shown on camera preview, since they are not used
for editing pictures.

Hide these camera setting options to avoid making user confused.

Change-Id: I26599c4d97043069eee9c1a069325735ba625a94
CRs-Fixed: 895938

2 files changed, 26 insertions, 0 deletions

diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index e8dd948c3..276a78db2 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -1005,6 +1005,7 @@ public class PhotoUI implements PieListener,
     }
 
     protected void showCapturedImageForReview(byte[] jpegData, int orientation, boolean mirror) {
+        mCameraControls.hideCameraSettings();
         mDecodeTaskForReview = new DecodeImageForReview(jpegData, orientation, mirror);
         mDecodeTaskForReview.execute();
         mOnScreenIndicators.setVisibility(View.GONE);
@@ -1017,6 +1018,7 @@ public class PhotoUI implements PieListener,
     }
 
     protected void hidePostCaptureAlert() {
+        mCameraControls.showCameraSettings();
         if (mDecodeTaskForReview != null) {
             mDecodeTaskForReview.cancel(true);
         }
diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java
index c0defea06..940cab17e 100644
--- a/src/com/android/camera/ui/CameraControls.java
+++ b/src/com/android/camera/ui/CameraControls.java
@@ -916,6 +916,30 @@ public class CameraControls extends RotatableLayout {
         layoutRemaingPhotos();
     }
 
+    public void hideCameraSettings() {
+        mFrontBackSwitcher.setVisibility(View.INVISIBLE);
+        if(TsMakeupManager.HAS_TS_MAKEUP) {
+            mTsMakeupSwitcher.setVisibility(View.INVISIBLE);
+        } else {
+            mHdrSwitcher.setVisibility(View.INVISIBLE);
+        }
+        mSceneModeSwitcher.setVisibility(View.INVISIBLE);
+        mFilterModeSwitcher.setVisibility(View.INVISIBLE);
+        mMenu.setVisibility(View.INVISIBLE);
+    }
+
+    public void showCameraSettings() {
+        mFrontBackSwitcher.setVisibility(View.VISIBLE);
+        if(TsMakeupManager.HAS_TS_MAKEUP) {
+            mTsMakeupSwitcher.setVisibility(View.VISIBLE);
+        } else {
+            mHdrSwitcher.setVisibility(View.VISIBLE);
+        }
+        mSceneModeSwitcher.setVisibility(View.VISIBLE);
+        mFilterModeSwitcher.setVisibility(View.VISIBLE);
+        mMenu.setVisibility(View.VISIBLE);
+    }
+
     private class ArrowTextView extends TextView {
         private static final int TEXT_SIZE = 14;
         private static final int PADDING_SIZE = 18;