diff options
| author | Andy Huibers <andyhuibers@google.com> | 2013-11-12 19:10:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-12 19:10:38 +0000 |
| commit | a7c84bacfd76e5e865655bd5a9b248d64f970af1 (patch) | |
| tree | 2938abfaa1e30514b18abea147a49916214a6d7b | |
| parent | aae09fb1ab292932504233da4be5181ce74db763 (diff) | |
| parent | 249653e41763cffbd9bd5ef2298c5120488897fb (diff) | |
| download | android_packages_apps_Snap-a7c84bacfd76e5e865655bd5a9b248d64f970af1.tar.gz android_packages_apps_Snap-a7c84bacfd76e5e865655bd5a9b248d64f970af1.tar.bz2 android_packages_apps_Snap-a7c84bacfd76e5e865655bd5a9b248d64f970af1.zip | |
Merge "Close mode menus if another control is touched" into gb-ub-photos-carlsbad
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 1 | ||||
| -rw-r--r-- | src/com/android/camera/PhotoUI.java | 2 | ||||
| -rw-r--r-- | src/com/android/camera/VideoUI.java | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 84c54a836..e7ccbb1e5 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1587,6 +1587,7 @@ public class CameraActivity extends Activity @Override public void onShowSwitcherPopup() { + mCurrentModule.onShowSwitcherPopup(); } /** diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index 744802f64..8308e1561 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -743,6 +743,8 @@ public class PhotoUI implements PieListener, if (mFaceView != null) { mFaceView.setBlockDraw(true); } + // Close module selection menu when pie menu is opened. + mSwitcher.closePopup(); } @Override diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java index 8b01ba4b8..a8819e054 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java @@ -553,6 +553,8 @@ public class VideoUI implements PieRenderer.PieListener, @Override public void onPieOpened(int centerX, int centerY) { setSwipingEnabled(false); + // Close module selection menu when pie menu is opened. + mSwitcher.closePopup(); } @Override |