diff options
author | Jack Yoo <jyoo@codeaurora.org> | 2016-01-21 13:51:44 -0800 |
---|---|---|
committer | Camera Software Integration <camswint@localhost> | 2016-01-30 12:59:30 -0700 |
commit | 1c7de468595620e3f19304f6363a3143c0c166f6 (patch) | |
tree | ca9be95873db31921ca42a0f7e32dc5915ff679d /src/com/android | |
parent | fb95db592c22f82828ca473a16ec3500f8a3328c (diff) | |
download | android_packages_apps_Snap-1c7de468595620e3f19304f6363a3143c0c166f6.tar.gz android_packages_apps_Snap-1c7de468595620e3f19304f6363a3143c0c166f6.tar.bz2 android_packages_apps_Snap-1c7de468595620e3f19304f6363a3143c0c166f6.zip |
SnapdragonCamera: Closing pie on auto focus change.
Closing pie renderer on auto focus change in case of
incomplete focus attempt.
Move focusmode menu to developer option too
Change-Id: I97faf95b640a8f4fedea8c5f2f8ca4ab020c8cca
CRs-Fixed: 961396
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/camera/PhotoMenu.java | 1 | ||||
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index a725b471c..0e4db9503 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -187,7 +187,6 @@ public class PhotoMenu extends MenuController CameraSettings.KEY_EXPOSURE, CameraSettings.KEY_WHITE_BALANCE, CameraSettings.KEY_QC_CHROMA_FLASH, - CameraSettings.KEY_FOCUS_MODE, CameraSettings.KEY_REDEYE_REDUCTION }; diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index df2bb7a5f..5cc4edf0a 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -3446,6 +3446,11 @@ public class PhotoModule String fMode = Parameters.FLASH_MODE_OFF; mParameters.setFlashMode(fMode); } + + if(!mFocusManager.getFocusMode().equals(Parameters.FOCUS_MODE_CONTINUOUS_PICTURE) && + !mFocusManager.isFocusCompleted()) { + mUI.clearFocus(); + } } private int estimateJpegFileSize(final Size size, final String quality) { |