diff options
author | Jing (Mia) Wang <wangjing@codeaurora.org> | 2016-09-09 18:20:22 +0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-10-04 09:10:06 -0700 |
commit | f6a5a9c682f2c4ad845844edc5c29130e9f1b0d2 (patch) | |
tree | 136d0c8b8215321dfb4bd2588e0aea8b0628799d /src/com/android/camera/PhotoUI.java | |
parent | abea9eff1dee97e0ee30d487dae856c04068d754 (diff) | |
download | android_packages_apps_Snap-f6a5a9c682f2c4ad845844edc5c29130e9f1b0d2.tar.gz android_packages_apps_Snap-f6a5a9c682f2c4ad845844edc5c29130e9f1b0d2.tar.bz2 android_packages_apps_Snap-f6a5a9c682f2c4ad845844edc5c29130e9f1b0d2.zip |
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
Diffstat (limited to 'src/com/android/camera/PhotoUI.java')
-rw-r--r-- | src/com/android/camera/PhotoUI.java | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index fb3ef36e2..14c55101c 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 |