SnapdragonCamera: Make camcorder switcher icon invisible.

When take photo for contact and back from setting ,the camcorder
switcher icon will show.

When take photo from contact,then set the camcoder switcher icon
invisible.

Change-Id: If0153650d131c5b1ee78a79c255c637aab410d8e
CRs-Fixed: 884351

2 files changed, 9 insertions, 1 deletions

diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index b31b7314f..8b1aa4e68 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -549,6 +549,7 @@ public class PhotoUI implements PieListener,
         });
         if (mController.isImageCaptureIntent()) {
             hideSwitcher();
+            mSwitcher.setSwitcherVisibility(false);
             ViewGroup cameraControls = (ViewGroup) mRootView.findViewById(R.id.camera_controls);
             mActivity.getLayoutInflater().inflate(R.layout.review_module_control, cameraControls);
 
diff --git a/src/com/android/camera/ui/ModuleSwitcher.java b/src/com/android/camera/ui/ModuleSwitcher.java
index 6c20da497..217c92a54 100644
--- a/src/com/android/camera/ui/ModuleSwitcher.java
+++ b/src/com/android/camera/ui/ModuleSwitcher.java
@@ -53,6 +53,7 @@ public class ModuleSwitcher extends RotateImageView
     public static final int LIGHTCYCLE_MODULE_INDEX = 3;
     public static final int GCAM_MODULE_INDEX = 4;
     private boolean mTouchEnabled = true;
+    private boolean mIsVisible = true;
 
     private static final int[] DRAW_IDS = {
             R.drawable.ic_switch_camera,
@@ -267,9 +268,15 @@ public class ModuleSwitcher extends RotateImageView
         mParent.setOnTouchListener(null);
     }
 
+    public void setSwitcherVisibility(boolean isVisible) {
+        mIsVisible = isVisible;
+    }
+
     public void removePopup() {
         mShowingPopup = false;
-        setVisibility(View.VISIBLE);
+        if (mIsVisible) {
+            setVisibility(View.VISIBLE);
+        }
         if (mPopup != null) {
             ((ViewGroup) mParent).removeView(mPopup);
             mPopup = null;