Show capturing UI before review UI in intent countdown timer
Going prematurely to the review UI means you can hit the checkbox
before we have JPEG data. With this change, after countdown you
see a grayed out capture button like normal capture animation,
then the checkbox review UI when the picture is ready.
Bug: 18002016
Change-Id: Ieddd71636f962c127aa470ec0f150987d3d287ab
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index e8b05aa..46b5b0a 100644
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -377,11 +377,7 @@
@Override
public void onCountDownFinished() {
- if (mIsImageCaptureIntent) {
- mAppController.getCameraAppUI().transitionToIntentReviewLayout();
- } else {
- mAppController.getCameraAppUI().transitionToCapture();
- }
+ mAppController.getCameraAppUI().transitionToCapture();
mAppController.getCameraAppUI().showModeOptions();
if (mPaused) {
return;
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index d363591..5634fd7 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1168,6 +1168,7 @@
} else {
mJpegImageData = jpegData;
if (!mQuickCapture) {
+ Log.v(TAG, "showing UI");
mUI.showCapturedImageForReview(jpegData, orientation, mMirror);
} else {
onCaptureDone();
@@ -1269,6 +1270,7 @@
@Override
public boolean capture() {
+ Log.i(TAG, "capture");
// If we are already in the middle of taking a snapshot or the image
// save request is full then ignore.
if (mCameraDevice == null || mCameraState == SNAPSHOT_IN_PROGRESS
@@ -1400,6 +1402,7 @@
@Override
public void onCaptureDone() {
+ Log.i(TAG, "onCaptureDone");
if (mPaused) {
return;
}
@@ -1564,11 +1567,7 @@
@Override
public void onCountDownFinished() {
- if (mIsImageCaptureIntent) {
- mAppController.getCameraAppUI().transitionToIntentReviewLayout();
- } else {
- mAppController.getCameraAppUI().transitionToCapture();
- }
+ mAppController.getCameraAppUI().transitionToCapture();
mAppController.getCameraAppUI().showModeOptions();
if (mPaused) {
return;
@@ -1679,6 +1678,7 @@
@Override
public void pause() {
+ Log.v(TAG, "pause");
mPaused = true;
getServices().getRemoteShutterListener().onModuleExit();
SessionStatsCollector.instance().sessionActive(false);