summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PreviewGestures.java
diff options
context:
space:
mode:
authorByunghun Jeon <bjeon@codeaurora.org>2016-07-28 11:07:46 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-08-16 16:14:20 -0700
commit0321ab092671d680373bff35673fa6a069d7e57e (patch)
tree7701d89c8d954ed3e3cf2cdc732a58a1c71f4953 /src/com/android/camera/PreviewGestures.java
parent42b7f259afb971c2672cf6226fd22679acacecb2 (diff)
downloadandroid_packages_apps_Snap-0321ab092671d680373bff35673fa6a069d7e57e.tar.gz
android_packages_apps_Snap-0321ab092671d680373bff35673fa6a069d7e57e.tar.bz2
android_packages_apps_Snap-0321ab092671d680373bff35673fa6a069d7e57e.zip
SnapdragonCamera: Remove swipe right to open menu
Remove swipe right to open menu. CRs-Fixed: 1028467 Change-Id: Ib90a3002e2e6815b5d6f7aea8fdf73aafbe527ee
Diffstat (limited to 'src/com/android/camera/PreviewGestures.java')
-rw-r--r--src/com/android/camera/PreviewGestures.java25
1 files changed, 2 insertions, 23 deletions
diff --git a/src/com/android/camera/PreviewGestures.java b/src/com/android/camera/PreviewGestures.java
index 48bfb7e58..0ac6ce01c 100644
--- a/src/com/android/camera/PreviewGestures.java
+++ b/src/com/android/camera/PreviewGestures.java
@@ -87,29 +87,8 @@ public class PreviewGestures
return false;
}
if (mZoomOnly || mMode == MODE_ZOOM) return false;
- int deltaX = (int) (e1.getX() - e2.getX());
- int deltaY = (int) (e1.getY() - e2.getY());
-
- int orientation = 0;
- if (mPhotoMenu != null)
- orientation = mPhotoMenu.getOrientation();
- else if (mVideoMenu != null)
- orientation = mVideoMenu.getOrientation();
- else if (mCaptureUI != null)
- orientation = mCaptureUI.getOrientation();
-
- if (isLeftSwipe(orientation, deltaX, deltaY)) {
- waitUntilNextDown = true;
- if (mPhotoMenu != null && !mPhotoMenu.isMenuBeingShown())
- mPhotoMenu.openFirstLevel();
- else if (mVideoMenu != null && !mVideoMenu.isMenuBeingShown())
- mVideoMenu.openFirstLevel();
- else if (mCaptureUI != null && !mCaptureUI.isMenuBeingShown())
- mCaptureUI.showSettingMenu();
- return true;
- } else {
- return onSingleTapUp(e2);
- }
+
+ return onSingleTapUp(e2);
}
private boolean isLeftSwipe(int orientation, int deltaX, int deltaY) {