diff options
author | Steve Kondik <shade@chemlab.org> | 2013-12-25 15:10:58 -0800 |
---|---|---|
committer | Arne Coucheron <arco68@gmail.com> | 2018-01-26 01:02:56 +0100 |
commit | d65ab55fff3f20affe650a4b6a1477f9a7d845c0 (patch) | |
tree | b41403934e27067a05c338971d128b63207be70c /src/com/android/camera/PhotoModule.java | |
parent | 3c70192ac84f19841cc4422410c7560f3fe69812 (diff) | |
download | android_packages_apps_Snap-d65ab55fff3f20affe650a4b6a1477f9a7d845c0.tar.gz android_packages_apps_Snap-d65ab55fff3f20affe650a4b6a1477f9a7d845c0.tar.bz2 android_packages_apps_Snap-d65ab55fff3f20affe650a4b6a1477f9a7d845c0.zip |
Snap: Remove touch AF/AEC option
* Drop the use of the touchaf-aec parameter entirely. No camera needs
this anymore.
Change-Id: I83154a75e5375901dc6c0fc93aef23637cfdf425
(cherry picked from commit 8ba41f452222c87a733fd2d045f9c513fd8d7799)
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 61 |
1 files changed, 11 insertions, 50 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 94f39e0c3..a82f81145 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -218,7 +218,6 @@ public class PhotoModule private boolean mAeLockSupported; private boolean mAwbLockSupported; private boolean mContinuousFocusSupported; - private boolean mTouchAfAecFlag; private boolean mLongshotSave = false; private boolean mRefocus = false; private boolean mLastPhotoTakenWithRefocus = false; @@ -356,7 +355,6 @@ public class PhotoModule private FocusOverlayManager mFocusManager; private String mSceneMode; - private String mCurrTouchAfAec = ParametersWrapper.TOUCH_AF_AEC_ON; private String mSavedFlashMode = null; private final Handler mHandler = new MainHandler(); @@ -885,8 +883,6 @@ public class PhotoModule mUI.setPreference(CameraSettings.KEY_ZSL, ParametersWrapper.ZSL_OFF); mUI.setPreference(CameraSettings.KEY_FACE_DETECTION, ParametersWrapper.FACE_DETECTION_OFF); - mUI.setPreference(CameraSettings.KEY_TOUCH_AF_AEC, - ParametersWrapper.TOUCH_AF_AEC_OFF); mUI.setPreference(CameraSettings.KEY_FOCUS_MODE, Parameters.FOCUS_MODE_AUTO); mUI.setPreference(CameraSettings.KEY_FLASH_MODE, @@ -1969,7 +1965,6 @@ public class PhotoModule } private void updateCommonManual3ASettings() { - String touchAfAec = ParametersWrapper.TOUCH_AF_AEC_OFF; mSceneMode = Parameters.SCENE_MODE_AUTO; String flashMode = Parameters.FLASH_MODE_OFF; String redeyeReduction = mActivity.getString(R.string. @@ -1981,7 +1976,7 @@ public class PhotoModule String exposureCompensation = CameraSettings.EXPOSURE_DEFAULT_VALUE; if (mManual3AEnabled > 0) { overrideCameraSettings(flashMode, null, null, - exposureCompensation, touchAfAec, + exposureCompensation, ParametersWrapper.getAutoExposure(mParameters), getSaturationSafe(), getContrastSafe(), @@ -1992,10 +1987,8 @@ public class PhotoModule mActivity.getString(R.string.setting_off_value)); } else { //enable all - touchAfAec = mActivity.getString( - R.string.pref_camera_touchafaec_default); overrideCameraSettings(null, null, null, - null, touchAfAec, null, + null, null, null, null, null, null, null, null, null); mUI.overrideSettings(CameraSettings.KEY_LONGSHOT, null); @@ -2029,7 +2022,6 @@ public class PhotoModule String focusMode = null; String colorEffect = null; String exposureCompensation = null; - String touchAfAec = null; boolean disableLongShot = false; String ubiFocusOn = mActivity.getString(R.string. @@ -2112,7 +2104,7 @@ public class PhotoModule exposureCompensation = CameraSettings.EXPOSURE_DEFAULT_VALUE; overrideCameraSettings(null, null, focusMode, - exposureCompensation, touchAfAec, null, + exposureCompensation, null, null, null, null, colorEffect, sceneMode, redeyeReduction, aeBracketing); disableLongShot = true; @@ -2141,10 +2133,9 @@ public class PhotoModule } exposureCompensation = Integer.toString(mParameters.getExposureCompensation()); - touchAfAec = mCurrTouchAfAec; overrideCameraSettings(null, whiteBalance, focusMode, - exposureCompensation, touchAfAec, + exposureCompensation, ParametersWrapper.getAutoExposure(mParameters), getSaturationSafe(), getContrastSafe(), @@ -2154,7 +2145,7 @@ public class PhotoModule } else if (mFocusManager.isZslEnabled()) { focusMode = mParameters.getFocusMode(); overrideCameraSettings(null, null, focusMode, - exposureCompensation, touchAfAec, null, + exposureCompensation, null, null, null, null, colorEffect, sceneMode, redeyeReduction, aeBracketing); } else { @@ -2162,7 +2153,7 @@ public class PhotoModule updateCommonManual3ASettings(); } else { overrideCameraSettings(null, null, focusMode, - exposureCompensation, touchAfAec, null, + exposureCompensation, null, null, null, null, colorEffect, sceneMode, redeyeReduction, aeBracketing); } @@ -2256,17 +2247,16 @@ public class PhotoModule private void overrideCameraSettings(final String flashMode, final String whiteBalance, final String focusMode, - final String exposureMode, final String touchMode, - final String autoExposure, final String saturation, - final String contrast, final String sharpness, - final String coloreffect, final String sceneMode, - final String redeyeReduction, final String aeBracketing) { + final String exposureMode, final String autoExposure, + final String saturation, final String contrast, + final String sharpness, final String coloreffect, + final String sceneMode, final String redeyeReduction, + final String aeBracketing) { mUI.overrideSettings( CameraSettings.KEY_FLASH_MODE, flashMode, CameraSettings.KEY_WHITE_BALANCE, whiteBalance, CameraSettings.KEY_FOCUS_MODE, focusMode, CameraSettings.KEY_EXPOSURE, exposureMode, - CameraSettings.KEY_TOUCH_AF_AEC, touchMode, CameraSettings.KEY_AUTOEXPOSURE, autoExposure, CameraSettings.KEY_SATURATION, saturation, CameraSettings.KEY_CONTRAST, contrast, @@ -2973,10 +2963,6 @@ public class PhotoModule || mCameraState == PREVIEW_STOPPED) { return; } - //If Touch AF/AEC is disabled in UI, return - if(this.mTouchAfAecFlag == false) { - return; - } // Check if metering area or focus area is supported. if (!mFocusAreaSupported && !mMeteringAreaSupported) return; if (! mFocusManager.getPreviewRect().contains(x, y)) return; @@ -3349,31 +3335,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, - ParametersWrapper.getSupportedTouchAfAec(mParameters))) { - mCurrTouchAfAec = touchAfAec; - ParametersWrapper.setTouchAfAec(mParameters, touchAfAec); - } - } else { - ParametersWrapper.setTouchAfAec(mParameters, ParametersWrapper.TOUCH_AF_AEC_OFF); - mFocusManager.resetTouchFocus(); - } - try { - if(ParametersWrapper.getTouchAfAec(mParameters).equals(ParametersWrapper.TOUCH_AF_AEC_ON)) - this.mTouchAfAecFlag = true; - else - this.mTouchAfAecFlag = false; - } catch(Exception e){ - Log.e(TAG, "Handled NULL pointer Exception"); - } - // Set Picture Format // Picture Formats specified in UI should be consistent with // PIXEL_FORMAT_JPEG and PIXEL_FORMAT_RAW constants |