diff options
author | Alan Newberger <alann@google.com> | 2014-09-23 00:35:31 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-23 00:35:31 +0000 |
commit | 9f3628da2cbef7db47e5f9f5e0e2f69a451ee4b9 (patch) | |
tree | cbce732145332540952d0ca754ea311fee761329 | |
parent | 8f1ffed79db5d7e17f56501b5d62157846fb55bd (diff) | |
parent | 5f86f7fdd19dad9cdf670e0504cfaddefd4a89fc (diff) | |
download | android_packages_apps_Camera2-9f3628da2cbef7db47e5f9f5e0e2f69a451ee4b9.tar.gz android_packages_apps_Camera2-9f3628da2cbef7db47e5f9f5e0e2f69a451ee4b9.tar.bz2 android_packages_apps_Camera2-9f3628da2cbef7db47e5f9f5e0e2f69a451ee4b9.zip |
am 5f86f7fd: Cleanup gesture UI hide code
* commit '5f86f7fdd19dad9cdf670e0504cfaddefd4a89fc':
Cleanup gesture UI hide code
-rw-r--r-- | src/com/android/camera/ui/PreviewOverlay.java | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/com/android/camera/ui/PreviewOverlay.java b/src/com/android/camera/ui/PreviewOverlay.java index ba0e697e1..3ccc7584c 100644 --- a/src/com/android/camera/ui/PreviewOverlay.java +++ b/src/com/android/camera/ui/PreviewOverlay.java @@ -198,15 +198,6 @@ public class PreviewOverlay extends View if (ev.getPointerCount() > 1) { mDeltaX = ev.getX(1) - ev.getX(0); mDeltaY = ev.getY(1) - ev.getY(0); - if (ev.getActionMasked() == MotionEvent.ACTION_POINTER_DOWN) { - if (!mZoomProcessor.isVisible()) { - mZoomProcessor.showZoomUI(); - } - } else if (ev.getActionMasked() == MotionEvent.ACTION_POINTER_UP) { - if (mZoomProcessor.isVisible()) { - mZoomProcessor.hideZoomUI(); - } - } } return handled; } @@ -309,8 +300,12 @@ public class PreviewOverlay extends View public boolean onScale(ScaleGestureDetector detector) { final float sf = detector.getScaleFactor(); mCurrentRatio = (0.33f + mCurrentRatio) * sf * sf - 0.33f; - if (mCurrentRatio < mMinRatio) mCurrentRatio = mMinRatio; - if (mCurrentRatio > mMaxRatio) mCurrentRatio = mMaxRatio; + if (mCurrentRatio < mMinRatio) { + mCurrentRatio = mMinRatio; + } + if (mCurrentRatio > mMaxRatio) { + mCurrentRatio = mMaxRatio; + } // Only call the listener with a certain frequency. This is // necessary because these listeners will make repeated @@ -331,10 +326,10 @@ public class PreviewOverlay extends View @Override public boolean onScaleBegin(ScaleGestureDetector detector) { + mZoomProcessor.showZoomUI(); if (mZoomListener == null) { return false; } - mVisible = true; if (mZoomListener != null) { mZoomListener.onZoomStart(); } @@ -345,7 +340,7 @@ public class PreviewOverlay extends View @Override public void onScaleEnd(ScaleGestureDetector detector) { - mVisible = false; + mZoomProcessor.hideZoomUI(); if (mZoomListener != null) { mZoomListener.onZoomEnd(); } |