Merge "Close mode menus if another control is touched" into gb-ub-photos-carlsbad
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 84c54a8..e7ccbb1 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1587,6 +1587,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