summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngus Kong <shkong@google.com>2013-01-23 10:05:38 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-01-23 10:05:38 -0800
commit14c085129e297624330dab1cf702a0675cafb7d1 (patch)
tree50c0e38b7d02ab81358547ba94b50750e78a014f
parent38008f139d7524bc01b329cb87482436146757fa (diff)
parent54ed58a3351e0558eb06b59441b1c3875feaf886 (diff)
downloadCamera-14c085129e297624330dab1cf702a0675cafb7d1.tar.gz
am 54ed58a3: Don\'t allow invisible shutterbutton to be clicked.
* commit '54ed58a3351e0558eb06b59441b1c3875feaf886': Don't allow invisible shutterbutton to be clicked.
-rwxr-xr-xsrc/com/android/camera/ShutterButton.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/ShutterButton.java b/src/com/android/camera/ShutterButton.java
index 2eb89c53..a1bbb1a0 100755
--- a/src/com/android/camera/ShutterButton.java
+++ b/src/com/android/camera/ShutterButton.java
@@ -19,6 +19,7 @@ package com.android.camera;
import android.content.Context;
import android.util.AttributeSet;
import android.view.MotionEvent;
+import android.view.View;
import android.widget.ImageView;
/**
@@ -121,7 +122,7 @@ public class ShutterButton extends ImageView {
@Override
public boolean performClick() {
boolean result = super.performClick();
- if (mListener != null) {
+ if (mListener != null && getVisibility() == View.VISIBLE) {
mListener.onShutterButtonClick();
}
return result;