diff options
author | Doris Liu <tianliu@google.com> | 2013-05-08 00:27:28 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-08 00:27:28 +0000 |
commit | 0815098550dd4158386d059b04de7f13fb415620 (patch) | |
tree | a5743de0e66845799c1d23de39d4b386c2c2fb88 /src/com | |
parent | e94d00bb84955b4928616af297b61b97f36f3345 (diff) | |
parent | 69ef5ea6ed838cf6fba834811f01122d349a61cf (diff) | |
download | android_packages_apps_Snap-0815098550dd4158386d059b04de7f13fb415620.tar.gz android_packages_apps_Snap-0815098550dd4158386d059b04de7f13fb415620.tar.bz2 android_packages_apps_Snap-0815098550dd4158386d059b04de7f13fb415620.zip |
Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryce
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/camera/VideoController.java | 2 | ||||
-rw-r--r-- | src/com/android/camera/VideoModule.java | 9 | ||||
-rw-r--r-- | src/com/android/camera/VideoUI.java | 3 | ||||
-rw-r--r-- | src/com/android/camera/ui/CameraControls.java | 2 |
4 files changed, 14 insertions, 2 deletions
diff --git a/src/com/android/camera/VideoController.java b/src/com/android/camera/VideoController.java index 8bde8090f..474f521de 100644 --- a/src/com/android/camera/VideoController.java +++ b/src/com/android/camera/VideoController.java @@ -27,7 +27,7 @@ public interface VideoController extends OnShutterButtonListener { public void onReviewPlayClicked(View view); public boolean isVideoCaptureIntent(); - + public boolean isInReviewMode(); public int onZoomChanged(int index); public void onSingleTapUp(View view, int x, int y); diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 0bcdbabb5..f7830a303 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -126,6 +126,7 @@ public class VideoModule implements CameraModule, private boolean mIsVideoCaptureIntent; private boolean mQuickCapture; + private boolean mIsInReviewMode = false; private MediaRecorder mMediaRecorder; private EffectsRecorder mEffectsRecorder; @@ -541,15 +542,22 @@ public class VideoModule implements CameraModule, @OnClickAttr public void onReviewDoneClicked(View v) { + mIsInReviewMode = false; doReturnToCaller(true); } @OnClickAttr public void onReviewCancelClicked(View v) { + mIsInReviewMode = false; stopVideoRecording(); doReturnToCaller(false); } + @Override + public boolean isInReviewMode() { + return mIsInReviewMode; + } + private void onStopVideoRecording() { mEffectsDisplayResult = true; boolean recordFail = stopVideoRecording(); @@ -1525,6 +1533,7 @@ public class VideoModule implements CameraModule, } private void showCaptureResult() { + mIsInReviewMode = true; Bitmap bitmap = null; if (mVideoFileDescriptor != null) { bitmap = Thumbnail.createVideoThumbnailBitmap(mVideoFileDescriptor.getFileDescriptor(), diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java index 0afcd8a8d..0c9457204 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java @@ -293,6 +293,9 @@ public class VideoUI implements SurfaceHolder.Callback, PieRenderer.PieListener, } public void dismissPopup(boolean topLevelPopupOnly, boolean fullScreen) { + // In review mode, we do not want to bring up the camera UI + if (mController.isInReviewMode()) return; + if (fullScreen) { mActivity.showUI(); mBlocker.setVisibility(View.VISIBLE); diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java index d63a454a9..7940ae0d9 100644 --- a/src/com/android/camera/ui/CameraControls.java +++ b/src/com/android/camera/ui/CameraControls.java @@ -317,7 +317,7 @@ public class CameraControls extends RotatableLayout { // on the wrong side of the screen. We need to make adjustment to move the controls // to the USB side public void adjustControlsToRightPosition() { - int orientation = Util.getDisplayRotation((Activity) getContext()); + int orientation = getUnifiedRotation(); if (orientation >= 180) { flipChildren(); } |