diff options
author | mingwax <mingwax@codeaurora.org> | 2017-01-04 11:07:14 +0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-09 00:32:38 -0800 |
commit | a69fd4b57febb2321c5a02888abc096c84597382 (patch) | |
tree | 9834b2cafc05bf172f0055903e72886135c0446c /src | |
parent | 15f6d966c807c371a12f68bf9f5f4e7447a9ba8e (diff) | |
download | android_packages_apps_Snap-a69fd4b57febb2321c5a02888abc096c84597382.tar.gz android_packages_apps_Snap-a69fd4b57febb2321c5a02888abc096c84597382.tar.bz2 android_packages_apps_Snap-a69fd4b57febb2321c5a02888abc096c84597382.zip |
SnapdragonCamera:Fix start RefocusActivity when not in UbiFocusMode
When the user set the mode is not UbiFocusMode, set the mIsRefocus
value is false, ensure start the gallery, not the RefocusActivity.
CRs-Fixed: 1106861
Change-Id: I4c766a0da00219d4fa99f2bcd05a3f33f41d02b1
Diffstat (limited to 'src')
-rw-r--r-- | 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 26613786f..1122d6703 100644 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -2331,6 +2331,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( @@ -4321,6 +4324,7 @@ public class CaptureModule implements CameraModule, PhotoController, onPauseAfterSuper(); onResumeBeforeSuper(); onResumeAfterSuper(); + setRefocusLastTaken(false); } public void restartSession(boolean isSurfaceChanged) { |