summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2013-06-11 22:34:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-06-11 22:34:23 +0000
commita4165b172691b5e9eaff8ee853045f4720e65456 (patch)
tree889fc96964a877f4f2a354c977a9eb1eabbc9642 /src/com/android
parenta5d2367c644ac34f12a191fa1ec1274ccebf9435 (diff)
parentcfd86991cbe82976b7ad540ac871988bc69ea2b9 (diff)
downloadandroid_packages_apps_Snap-a4165b172691b5e9eaff8ee853045f4720e65456.tar.gz
android_packages_apps_Snap-a4165b172691b5e9eaff8ee853045f4720e65456.tar.bz2
android_packages_apps_Snap-a4165b172691b5e9eaff8ee853045f4720e65456.zip
Merge "Disable zoom when camera does not support zoom" into gb-ub-photos-carlsbad
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/camera/NewPreviewGestures.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/com/android/camera/NewPreviewGestures.java b/src/com/android/camera/NewPreviewGestures.java
index 39c4be664..339c4b33f 100644
--- a/src/com/android/camera/NewPreviewGestures.java
+++ b/src/com/android/camera/NewPreviewGestures.java
@@ -69,6 +69,7 @@ public class NewPreviewGestures
private int mMode;
private int mSlop;
private int mTapTimeout;
+ private boolean mZoomEnabled;
private boolean mEnabled;
private boolean mZoomOnly;
private int mOrientation;
@@ -148,6 +149,10 @@ public class NewPreviewGestures
mEnabled = enabled;
}
+ public void setZoomEnabled(boolean enable) {
+ mZoomEnabled = enable;
+ }
+
public void setZoomOnly(boolean zoom) {
mZoomOnly = zoom;
}
@@ -178,7 +183,10 @@ public class NewPreviewGestures
mScale.onTouchEvent(m);
if (MotionEvent.ACTION_POINTER_DOWN == m.getActionMasked()) {
mMode = MODE_ZOOM;
- mZoom.onScaleBegin(mScale);
+ if (mZoomEnabled) {
+ // Start showing zoom UI as soon as there is a second finger down
+ mZoom.onScaleBegin(mScale);
+ }
} else if (MotionEvent.ACTION_POINTER_UP == m.getActionMasked()) {
mZoom.onScaleEnd(mScale);
}
@@ -241,6 +249,7 @@ public class NewPreviewGestures
if (mPie == null || !mPie.isOpen()) {
mMode = MODE_ZOOM;
mGestureDetector.onTouchEvent(makeCancelEvent(mCurrent));
+ if (!mZoomEnabled) return false;
return mZoom.onScaleBegin(detector);
}
return false;