diff options
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 14 | ||||
| -rw-r--r-- | src/com/android/camera/PhotoUI.java | 2 | ||||
| -rw-r--r-- | src/com/android/camera/VideoUI.java | 4 |
3 files changed, 19 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 904bdabc8..6af88cc9d 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -1396,4 +1396,18 @@ public class PhotoMenu extends MenuController public int getOrientation() { return mUI == null ? 0 : mUI.getOrientation(); } + + public void hideTopMenu(boolean hide) { + if (hide) { + mSceneModeSwitcher.setVisibility(View.GONE); + mFilterModeSwitcher.setVisibility(View.GONE); + mFrontBackSwitcher.setVisibility(View.GONE); + mTsMakeupSwitcher.setVisibility(View.GONE); + } else { + mSceneModeSwitcher.setVisibility(View.VISIBLE); + mFilterModeSwitcher.setVisibility(View.VISIBLE); + mFrontBackSwitcher.setVisibility(View.VISIBLE); + mTsMakeupSwitcher.setVisibility(View.VISIBLE); + } + } } diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index b31b7314f..4e4ae1e4b 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -1007,6 +1007,7 @@ public class PhotoUI implements PieListener, CameraUtil.fadeIn(mReviewDoneButton); mShutterButton.setVisibility(View.INVISIBLE); CameraUtil.fadeIn(mReviewRetakeButton); + mMenu.hideTopMenu(true); pauseFaceDetection(); } @@ -1017,6 +1018,7 @@ public class PhotoUI implements PieListener, mReviewImage.setVisibility(View.GONE); mOnScreenIndicators.setVisibility(View.VISIBLE); mMenuButton.setVisibility(View.VISIBLE); + mMenu.hideTopMenu(false); CameraUtil.fadeOut(mReviewDoneButton); mShutterButton.setVisibility(View.VISIBLE); CameraUtil.fadeOut(mReviewRetakeButton); diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java index 82d6e2987..da4e7565e 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java @@ -902,7 +902,9 @@ public class VideoUI implements PieRenderer.PieListener, public void showUIafterRecording() { mCameraControls.setWillNotDraw(false); - mVideoMenu.showUI(); + if (!mController.isVideoCaptureIntent()) { + mVideoMenu.showUI(); + } } public void showReviewImage(Bitmap bitmap) { |