diff options
| author | Doris Liu <tianliu@google.com> | 2013-06-11 13:31:41 -0700 |
|---|---|---|
| committer | Doris Liu <tianliu@google.com> | 2013-06-11 13:59:09 -0700 |
| commit | cfd86991cbe82976b7ad540ac871988bc69ea2b9 (patch) | |
| tree | 0dc69f3e243a9b112cc7cdf8ccb34628506f6f6e /src | |
| parent | ae56dacc8a278cd3dc74995f630b8044af444923 (diff) | |
| download | android_packages_apps_Snap-cfd86991cbe82976b7ad540ac871988bc69ea2b9.tar.gz android_packages_apps_Snap-cfd86991cbe82976b7ad540ac871988bc69ea2b9.tar.bz2 android_packages_apps_Snap-cfd86991cbe82976b7ad540ac871988bc69ea2b9.zip | |
Disable zoom when camera does not support zoom
Change-Id: I5b4c38636614df37db1ef3166368f1650c9e5fa0
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/NewPreviewGestures.java | 11 |
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; |