diff options
Diffstat (limited to 'src/com/android/camera/PreviewGestures.java')
| -rw-r--r-- | src/com/android/camera/PreviewGestures.java | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/src/com/android/camera/PreviewGestures.java b/src/com/android/camera/PreviewGestures.java index f4262bade..bdf4c5657 100644 --- a/src/com/android/camera/PreviewGestures.java +++ b/src/com/android/camera/PreviewGestures.java @@ -55,7 +55,7 @@ public class PreviewGestures private boolean mEnabled; private boolean mZoomOnly; private GestureDetector mGestureDetector; - private CaptureMenu mCaptureMenu; + private CaptureUI mCaptureUI; private PhotoMenu mPhotoMenu; private VideoMenu mVideoMenu; private boolean waitUntilNextDown; @@ -95,8 +95,8 @@ public class PreviewGestures orientation = mPhotoMenu.getOrientation(); else if (mVideoMenu != null) orientation = mVideoMenu.getOrientation(); - else if (mCaptureMenu != null) - orientation = mCaptureMenu.getOrientation(); + else if (mCaptureUI != null) + orientation = mCaptureUI.getOrientation(); if (isSwipeForMenu(orientation, deltaX, deltaY)) { waitUntilNextDown = true; @@ -104,8 +104,8 @@ public class PreviewGestures mPhotoMenu.openFirstLevel(); else if (mVideoMenu != null && !mVideoMenu.isMenuBeingShown()) mVideoMenu.openFirstLevel(); - else if (mCaptureMenu != null && !mCaptureMenu.isMenuBeingShown()) - mCaptureMenu.openFirstLevel(); + else if (mCaptureUI != null && !mCaptureUI.isMenuBeingShown()) + mCaptureUI.showSettingMenu(); return true; } return false; @@ -169,8 +169,8 @@ public class PreviewGestures return mEnabled; } - public void setCaptureMenu(CaptureMenu menu) { - mCaptureMenu = menu; + public void setCaptureUI(CaptureUI ui) { + mCaptureUI = ui; } public void setPhotoMenu(PhotoMenu menu) { @@ -181,10 +181,6 @@ public class PreviewGestures mVideoMenu = menu; } - public CaptureMenu getCaptureMenu() { - return mCaptureMenu; - } - public PhotoMenu getPhotoMenu() { return mPhotoMenu; } @@ -221,16 +217,17 @@ public class PreviewGestures return sendToPie(m); } - if (mCaptureMenu != null) { - if (mCaptureMenu.isMenuBeingShown()) { - if (!mCaptureMenu.isMenuBeingAnimated()) { + if (mCaptureUI != null) { + if (mCaptureUI.isMenuBeingShown()) { + if (!mCaptureUI.isMenuBeingAnimated()) { waitUntilNextDown = true; - mCaptureMenu.closeView(); + mCaptureUI.removeAllSettingMenu(true); } return true; } - if (mCaptureMenu.isPreviewMenuBeingShown()) { + if (mCaptureUI.isPreviewMenuBeingShown()) { waitUntilNextDown = true; + mCaptureUI.removeSceneAndFilterMenu(true); return true; } } |