SnapdragonCamera: Preview button should not work in secure mode

When camera is in secure mode, it will still listen to the preview
event although the circle is invisible to the user. So disable the
event listener of preview button.

Change-Id: Ic4f1dbf32163a7f210e3f4b87599699f44e8f7b0
CRs-Fixed: 1002685

4 files changed, 43 insertions, 30 deletions

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 4f91f02b9..97ea6641c 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -738,8 +738,12 @@ public class CameraActivity extends Activity
         mThumbnailDrawable = new CircularDrawable(bitmap);
         if (mThumbnail != null) {
             mThumbnail.setImageDrawable(mThumbnailDrawable);
-            mThumbnail.setVisibility(View.VISIBLE);
-        }
+            if (!isSecureCamera()) {
+                mThumbnail.setVisibility(View.VISIBLE);
+            } else {
+                mThumbnail.setVisibility(View.GONE);
+            }
+       }
     }
 
     public void updateThumbnail(ImageView thumbnail) {
@@ -747,7 +751,11 @@ public class CameraActivity extends Activity
         if (mThumbnail == null) return;
         if (mThumbnailDrawable != null) {
             mThumbnail.setImageDrawable(mThumbnailDrawable);
-            mThumbnail.setVisibility(View.VISIBLE);
+            if (!isSecureCamera()) {
+                mThumbnail.setVisibility(View.VISIBLE);
+            } else {
+                mThumbnail.setVisibility(View.GONE);
+            }
         }
     }
 
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index f8f632e6f..51fee413a 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -559,15 +559,17 @@ public class PhotoUI implements PieListener,
     }
 
     public void initializeControlByIntent() {
-        mThumbnail = (ImageView) mRootView.findViewById(R.id.preview_thumb);
-        mThumbnail.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (!CameraControls.isAnimating()
-                        && mController.getCameraState() != PhotoController.SNAPSHOT_IN_PROGRESS)
-                    mActivity.gotoGallery();
-            }
-        });
+        if (!mActivity.isSecureCamera()) {
+            mThumbnail = (ImageView) mRootView.findViewById(R.id.preview_thumb);
+            mThumbnail.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (!CameraControls.isAnimating()
+                            && mController.getCameraState() != PhotoController.SNAPSHOT_IN_PROGRESS)
+                        mActivity.gotoGallery();
+                }
+            });
+        }
         mMenuButton = mRootView.findViewById(R.id.menu);
         mMenuButton.setOnClickListener(new OnClickListener() {
             @Override
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index 00f3c705a..2aa83c179 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -673,17 +673,18 @@ public class VideoUI implements PieRenderer.PieListener,
 
         mGestures.setRenderOverlay(mRenderOverlay);
 
-        mThumbnail = (ImageView) mRootView.findViewById(R.id.preview_thumb);
-        mThumbnail.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                // Do not allow navigation to filmstrip during video recording
-                if (!mRecordingStarted && !CameraControls.isAnimating()) {
-                    mActivity.gotoGallery();
+        if (!mActivity.isSecureCamera()) {
+            mThumbnail = (ImageView) mRootView.findViewById(R.id.preview_thumb);
+            mThumbnail.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    // Do not allow navigation to filmstrip during video recording
+                    if (!mRecordingStarted && !CameraControls.isAnimating()) {
+                        mActivity.gotoGallery();
+                    }
                 }
-            }
-        });
-
+            });
+        }
     }
 
     public void setPreviewGesturesVideoUI() {
diff --git a/src/com/android/camera/WideAnglePanoramaUI.java b/src/com/android/camera/WideAnglePanoramaUI.java
index 14907e842..46cf173bb 100644
--- a/src/com/android/camera/WideAnglePanoramaUI.java
+++ b/src/com/android/camera/WideAnglePanoramaUI.java
@@ -122,14 +122,16 @@ public class WideAnglePanoramaUI implements
         mSwitcher = (ModuleSwitcher) mRootView.findViewById(R.id.camera_switcher);
         mSwitcher.setCurrentIndex(ModuleSwitcher.WIDE_ANGLE_PANO_MODULE_INDEX);
         mSwitcher.setSwitchListener(mActivity);
-        mThumbnail = (ImageView) mRootView.findViewById(R.id.preview_thumb);
-        mThumbnail.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (!CameraControls.isAnimating())
-                    mActivity.gotoGallery();
-            }
-        });
+        if (!mActivity.isSecureCamera()) {
+            mThumbnail = (ImageView) mRootView.findViewById(R.id.preview_thumb);
+            mThumbnail.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (!CameraControls.isAnimating())
+                        mActivity.gotoGallery();
+                }
+            });
+        }
 
         mSwitcher.setOnClickListener(new View.OnClickListener() {
             @Override