| commit | 249653e41763cffbd9bd5ef2298c5120488897fb | [log] [tgz] |
|---|---|---|
| author | Andy Huibers <andyhuibers@google.com> | Mon Nov 11 22:30:49 2013 -0800 |
| committer | Andy Huibers <andyhuibers@google.com> | Mon Nov 11 22:30:49 2013 -0800 |
| tree | 6f6bbbc565fb63a6aabe20c098ae7eacdd086a70 | |
| parent | 6a42c3ae157c4495db56541ef87f6ee56b5d10b3 [diff] |
Close mode menus if another control is touched Bug: 11598901 Bug: 11635865 Change-Id: I9c6237bacef9a28de1fa238e1e7378a57abfc573
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 29bf408..7b62f75 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java
@@ -1581,6 +1581,7 @@ @Override public void onShowSwitcherPopup() { + mCurrentModule.onShowSwitcherPopup(); } /**
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index 744802f..8308e15 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java
@@ -743,6 +743,8 @@ 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 8b01ba4..a8819e0 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java
@@ -553,6 +553,8 @@ @Override public void onPieOpened(int centerX, int centerY) { setSwipingEnabled(false); + // Close module selection menu when pie menu is opened. + mSwitcher.closePopup(); } @Override