diff options
author | Steve Kondik <steve@cyngn.com> | 2016-11-07 11:31:09 -0800 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2016-11-07 11:31:09 -0800 |
commit | 594d0fc312f957f0e9a1d64f658520f699e09b50 (patch) | |
tree | a3b6c2fd25160179ea16aadd9f721a68f5e2b663 | |
parent | ad83fbb06230e017b082541efa6afe6c60bffbd7 (diff) | |
download | android_packages_apps_Snap-594d0fc312f957f0e9a1d64f658520f699e09b50.tar.gz android_packages_apps_Snap-594d0fc312f957f0e9a1d64f658520f699e09b50.tar.bz2 android_packages_apps_Snap-594d0fc312f957f0e9a1d64f658520f699e09b50.zip |
snap: Fix advanced modes and focus override
* Always allow touch focus
* Set the scene mode correctly during advanced modes
Change-Id: I58ad050e90578e9d23102001da2f980498b8c774
-rwxr-xr-x | src/com/android/camera/PhotoModule.java | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index ab0dd83f0..f07d132c7 100755 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -3184,21 +3184,6 @@ public class PhotoModule String optizoomOn = mActivity.getString(R.string .pref_camera_advanced_feature_value_optizoom_on); - if (Parameters.SCENE_MODE_AUTO.equals(mSceneMode) || - CameraUtil.SCENE_MODE_HDR.equals(mSceneMode) || - optizoomOn.equals(mSceneMode)) { - // Set Touch AF/AEC parameter. - String touchAfAec = mPreferences.getString( - CameraSettings.KEY_TOUCH_AF_AEC, - mActivity.getString(R.string.pref_camera_touchafaec_default)); - if (CameraUtil.isSupported(touchAfAec, mParameters.getSupportedTouchAfAec())) { - mCurrTouchAfAec = touchAfAec; - mParameters.setTouchAfAec(touchAfAec); - } - } else { - mParameters.setTouchAfAec(mParameters.TOUCH_AF_AEC_OFF); - mFocusManager.resetTouchFocus(); - } try { if(mParameters.getTouchAfAec().equals(mParameters.TOUCH_AF_AEC_ON)) this.mTouchAfAecFlag = true; @@ -4012,7 +3997,30 @@ public class PhotoModule mCameraDevice.setParameters(mParameters); mParameters = mCameraDevice.getParameters(); } - } + } else { + if (refocusOn.equals(mSceneMode)) { + try { + mUI.setPreference(CameraSettings.KEY_ADVANCED_FEATURES, refocusOn); + } catch (NullPointerException e) { + } + } else if (optizoomOn.equals(mSceneMode)) { + try { + mUI.setPreference(CameraSettings.KEY_ADVANCED_FEATURES, optizoomOn); + } catch (NullPointerException e) { + } + } else if (chromaFlashOn.equals(mSceneMode)) { + try { + mUI.setPreference(CameraSettings.KEY_ADVANCED_FEATURES, chromaFlashOn); + mParameters.setSceneMode(Parameters.SCENE_MODE_AUTO); + } catch (NullPointerException e) { + } + } else { + mSceneMode = mParameters.getSceneMode(); + if (mSceneMode == null) { + mSceneMode = Parameters.SCENE_MODE_AUTO; + } + } + } // Set JPEG quality. int jpegQuality; |