diff options
| author | Camera Software Integration <camswint@localhost> | 2017-01-17 00:21:55 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-17 00:21:55 -0800 |
| commit | 762ccbfcbdb4468c328946bc6f145e2463c7695b (patch) | |
| tree | bb28935d2b12206896637fd7488df9640ba1f81d /src | |
| parent | b1e808040df6b5848d6693d50960c5ab5da0da1a (diff) | |
| parent | a69fd4b57febb2321c5a02888abc096c84597382 (diff) | |
| download | android_packages_apps_Snap-762ccbfcbdb4468c328946bc6f145e2463c7695b.tar.gz android_packages_apps_Snap-762ccbfcbdb4468c328946bc6f145e2463c7695b.tar.bz2 android_packages_apps_Snap-762ccbfcbdb4468c328946bc6f145e2463c7695b.zip | |
Merge "SnapdragonCamera：Fix start RefocusActivity when not in UbiFocusMode" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 42abf39b0..c6477cfc8 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -2371,6 +2371,9 @@ public class CaptureModule implements CameraModule, PhotoController, setProModeVisible(); String scene = mSettingsManager.getValue(SettingsManager.KEY_SCENE_MODE); + if (Integer.parseInt(scene) != SettingsManager.SCENE_MODE_UBIFOCUS_INT) { + setRefocusLastTaken(false); + } if(isPanoSetting(scene)) { if (mIntentMode != CaptureModule.INTENT_MODE_NORMAL) { mSettingsManager.setValue( @@ -4367,6 +4370,7 @@ public class CaptureModule implements CameraModule, PhotoController, onPauseAfterSuper(); onResumeBeforeSuper(); onResumeAfterSuper(); + setRefocusLastTaken(false); } public void restartSession(boolean isSurfaceChanged) { |