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

1 files changed, 11 insertions, 9 deletions

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