Merge branch 'lineage-18.1' of https://github.com/LineageOS/android_packages_apps_Snap into HEADHEADs12.1

Change-Id: Ia09760085480a6a028c8969f16f503070ab816e5

1 files changed, 10 insertions, 3 deletions

diff --git a/src/com/android/camera/PreviewGestures.java b/src/com/android/camera/PreviewGestures.java
index ce4587047..78591eab5 100755..100644
--- a/src/com/android/camera/PreviewGestures.java
+++ b/src/com/android/camera/PreviewGestures.java
@@ -93,17 +93,24 @@ 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());
             if((Math.abs(deltaX) > 40 || Math.abs(deltaY) > 40) && Math.abs(e1.getY()) < 1800) {
                 int orientation = 0;
-                if (mCaptureUI != null)
+                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 (mCaptureUI != null)
+                    if (mPhotoMenu != null && !mPhotoMenu.isMenuBeingShown())
+                        mPhotoMenu.openFirstLevel();
+                    else if (mVideoMenu != null && !mVideoMenu.isMenuBeingShown())
+                        mVideoMenu.openFirstLevel();
+                    else  if (mCaptureUI != null)
                         mCaptureUI.swipeCameraMode(-1);
                     if (mMultiCameraUI != null)
                         mMultiCameraUI.swipeCameraMode(-1);