summaryrefslogtreecommitdiff
path: root/src/com/android/camera/CaptureModule.java
diff options
context:
space:
mode:
authorzhuw <zhuw@codeaurora.org>2018-03-23 15:06:52 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2018-03-26 23:41:31 -0700
commita30b8e29e5ee18e351395bf10011d971d5721b56 (patch)
tree2ebe06d5ba729705503d20fab7770accf078f55e /src/com/android/camera/CaptureModule.java
parent96e4a08f12256adf2aef2a4368ab7200e667a054 (diff)
Fix shutterButton is grey when click during zoom
run cancelTAF only in preview state Change-Id: Ifff2ec98e4c3d2159104219310eb75f720c9b169
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
-rwxr-xr-xsrc/com/android/camera/CaptureModule.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index bf6d786bc..0e20779d9 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -4876,7 +4876,9 @@ public class CaptureModule implements CameraModule, PhotoController,
if (!checkSessionAndBuilder(mCaptureSession[id], mPreviewRequestBuilder[id])) {
return;
}
- cancelTouchFocus(id);
+ if (mState[id] == STATE_PREVIEW) {
+ cancelTouchFocus(id);
+ }
applyZoom(mPreviewRequestBuilder[id], id);
try {
if(id == MONO_ID && !canStartMonoPreview()) {