diff options
| -rwxr-xr-x | src/com/android/camera/CameraActivity.java | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/com/android/camera/PhotoUI.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 046265131..ea4bc03ba 100755 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -765,7 +765,7 @@ public class CameraActivity extends Activity if (mThumbnail == null) return; if (mThumbnailDrawable != null) { mThumbnail.setImageDrawable(mThumbnailDrawable); - if (!isSecureCamera()) { + if (!isSecureCamera() && !isCaptureIntent()) { mThumbnail.setVisibility(View.VISIBLE); } else { //under SecureCamera and UbiFocus mode, when back from RefocusActivity,if not save @@ -1432,7 +1432,7 @@ public class CameraActivity extends Activity } } - private boolean isCaptureIntent() { + public boolean isCaptureIntent() { if (MediaStore.ACTION_VIDEO_CAPTURE.equals(getIntent().getAction()) || MediaStore.ACTION_IMAGE_CAPTURE.equals(getIntent().getAction()) || MediaStore.ACTION_IMAGE_CAPTURE_SECURE.equals(getIntent().getAction())) { diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index 733868aad..bd892eda2 100644..100755 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -559,7 +559,7 @@ public class PhotoUI implements PieListener, } public void initializeControlByIntent() { - if (!mActivity.isSecureCamera()) { + if (!mActivity.isSecureCamera() && !mActivity.isCaptureIntent()) { mThumbnail = (ImageView) mRootView.findViewById(R.id.preview_thumb); mThumbnail.setOnClickListener(new OnClickListener() { @Override |