diff options
author | likaid <likaid@codeaurora.org> | 2015-08-28 16:08:41 +0800 |
---|---|---|
committer | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2016-01-11 10:42:18 -0800 |
commit | 6f1634723975e0acc88f2940d0488b315e7dd127 (patch) | |
tree | b005cd7b58e076625bb6411a47a8af697ad90dea /src/com | |
parent | a1b0f7ad512c87b7d2287975cf6ada231b8373ae (diff) | |
download | android_packages_apps_Snap-6f1634723975e0acc88f2940d0488b315e7dd127.tar.gz android_packages_apps_Snap-6f1634723975e0acc88f2940d0488b315e7dd127.tar.bz2 android_packages_apps_Snap-6f1634723975e0acc88f2940d0488b315e7dd127.zip |
SnapdragonCamera: Hide camera controllers when review captured image
The camera settings options including scene mode, color effect,
switcher for back/front camera, and the beautification make-up
should only be shown on camera preview, since they are not used
for editing pictures.
Hide these camera setting options to avoid making user confused.
Change-Id: I26599c4d97043069eee9c1a069325735ba625a94
CRs-Fixed: 895938
Diffstat (limited to 'src/com')
-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; |