diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-09-19 22:03:41 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-19 22:03:41 -0700 |
| commit | 91d9529fee2283f491737e6b55c8e5e8f738c9c2 (patch) | |
| tree | 21f44590d5257f023665c0806dc1e26f88a77b83 /src/com | |
| parent | 61afc876d9a8ee6bd314fe25f5bc0c83d51077d6 (diff) | |
| parent | 1324c7a05149ffa07a2b1339d1bc9bdff862e77e (diff) | |
| download | LegacyCamera-91d9529fee2283f491737e6b55c8e5e8f738c9c2.zip LegacyCamera-91d9529fee2283f491737e6b55c8e5e8f738c9c2.tar.gz LegacyCamera-91d9529fee2283f491737e6b55c8e5e8f738c9c2.tar.bz2 | |
Merge "Hide review controls in onResume." into ics-factoryrom
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/camera/Camera.java | 1 | ||||
| -rw-r--r-- | src/com/android/camera/VideoCamera.java | 8 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index ffd2137..5c645a4 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -422,6 +422,7 @@ public class Camera extends ActivityBase implements FocusManager.Listener, initializeZoom(); keepMediaProviderInstance(); checkStorage(); + hidePostCaptureAlert(); if (!mIsImageCaptureIntent) { updateThumbnailButton(); diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index 8a4784e..e9c3133 100644 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -791,7 +791,7 @@ public class VideoCamera extends ActivityBase if (mOpenCameraFail || mCameraDisabled) return; mZoomValue = 0; - mReviewImage.setVisibility(View.GONE); + hideAlert(); showVideoSnapshotUI(false); // Start orientation listener as soon as possible because it takes @@ -1595,7 +1595,7 @@ public class VideoCamera extends ActivityBase } private void hideAlert() { - mReviewImage.setVisibility(View.INVISIBLE); + mReviewImage.setVisibility(View.GONE); mShutterButton.setEnabled(true); enableCameraControls(true); @@ -1611,10 +1611,6 @@ public class VideoCamera extends ActivityBase } } - private boolean isAlertVisible() { - return this.mReviewImage.getVisibility() == View.VISIBLE; - } - private void stopVideoRecording() { Log.v(TAG, "stopVideoRecording"); if (mMediaRecorderRecording) { |