diff options
| -rw-r--r-- | src/com/android/camera/PhotoUI.java | 2 | ||||
| -rw-r--r-- | src/com/android/camera/ui/CameraControls.java | 16 |
2 files changed, 18 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index d0c2f5a3c..d7cf80186 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -984,6 +984,7 @@ public class PhotoUI implements PieListener, } protected void showCapturedImageForReview(byte[] jpegData, int orientation, boolean mirror) { + mCameraControls.hideCameraSettings(); mDecodeTaskForReview = new DecodeImageForReview(jpegData, orientation, mirror); mDecodeTaskForReview.execute(); mOnScreenIndicators.setVisibility(View.GONE); @@ -995,6 +996,7 @@ public class PhotoUI implements PieListener, } protected void hidePostCaptureAlert() { + mCameraControls.showCameraSettings(); if (mDecodeTaskForReview != null) { mDecodeTaskForReview.cancel(true); } diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java index 9695326c4..b6e31ada2 100644 --- a/src/com/android/camera/ui/CameraControls.java +++ b/src/com/android/camera/ui/CameraControls.java @@ -837,6 +837,22 @@ public class CameraControls extends RotatableLayout { layoutRemaingPhotos(); } + public void hideCameraSettings() { + mFrontBackSwitcher.setVisibility(View.INVISIBLE); + mHdrSwitcher.setVisibility(View.INVISIBLE); + mSceneModeSwitcher.setVisibility(View.INVISIBLE); + mFilterModeSwitcher.setVisibility(View.INVISIBLE); + mMenu.setVisibility(View.INVISIBLE); + } + + public void showCameraSettings() { + mFrontBackSwitcher.setVisibility(View.VISIBLE); + mHdrSwitcher.setVisibility(View.VISIBLE); + mSceneModeSwitcher.setVisibility(View.VISIBLE); + mFilterModeSwitcher.setVisibility(View.VISIBLE); + mMenu.setVisibility(View.VISIBLE); + } + private class ArrowTextView extends TextView { private static final int TEXT_SIZE = 14; private static final int PADDING_SIZE = 18; |