diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-08-17 18:32:52 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-08-17 18:32:52 -0700 |
| commit | 4fa682387b55e0c5893de94b762a84105ce4200a (patch) | |
| tree | ffdbb1d4cf3485ce7192cfac77a23c4c30a8411d /src | |
| parent | 1c4ba8cf4cc3d16823618e5d791dc28e43411bf3 (diff) | |
| parent | cd9b47d87962295934f8d1af15850520a868eb81 (diff) | |
| download | android_packages_apps_Snap-4fa682387b55e0c5893de94b762a84105ce4200a.tar.gz android_packages_apps_Snap-4fa682387b55e0c5893de94b762a84105ce4200a.tar.bz2 android_packages_apps_Snap-4fa682387b55e0c5893de94b762a84105ce4200a.zip | |
Merge "SnapdragonCamera: Hide the top menu items on captured preview"
Diffstat (limited to 'src')
| -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 f8667254a..e8dd948c3 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -1012,6 +1012,7 @@ public class PhotoUI implements PieListener, CameraUtil.fadeIn(mReviewDoneButton); mShutterButton.setVisibility(View.INVISIBLE); CameraUtil.fadeIn(mReviewRetakeButton); + mMenu.hideTopMenu(true); pauseFaceDetection(); } @@ -1022,6 +1023,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 5f2c7cd08..0966ef572 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) { |