diff options
author | junjiez <junjiez@codeaurora.org> | 2017-02-22 17:21:10 +0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-28 19:19:05 -0800 |
commit | b4cb89fa614337e13db510edb4eb230c76165d35 (patch) | |
tree | 9c13b26e32c5ed1765b346e155f498debdf87aff /src | |
parent | 727fdda2c1d3db4cc107825f8e6ab114f60b7064 (diff) | |
download | android_packages_apps_Snap-b4cb89fa614337e13db510edb4eb230c76165d35.tar.gz android_packages_apps_Snap-b4cb89fa614337e13db510edb4eb230c76165d35.tar.bz2 android_packages_apps_Snap-b4cb89fa614337e13db510edb4eb230c76165d35.zip |
SnapdragonCamera: fix thumbnail displayed in capture mode
Make it don't setup ImageView of thumbnail and don't update
thumbnail when it is in capture mode.
Change-Id: Ide2afb1eb34010c914d9ba78aa324f5e1c0b7fb0
CRs-Fixed: 2007834
Diffstat (limited to 'src')
-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 |