From 8ba41f452222c87a733fd2d045f9c513fd8d7799 Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Wed, 25 Dec 2013 15:10:58 -0800 Subject: Snap: Remove touch AF/AEC option * Drop the use of the touchaf-aec parameter entirely. No camera needs this anymore. Change-Id: I83154a75e5375901dc6c0fc93aef23637cfdf425 --- src/com/android/camera/CameraSettings.java | 7 ---- src/com/android/camera/PhotoMenu.java | 3 -- src/com/android/camera/PhotoModule.java | 51 +++++++----------------------- 3 files changed, 11 insertions(+), 50 deletions(-) (limited to 'src') diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index e5ce122e1..18c286aa7 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -96,7 +96,6 @@ public class CameraSettings { public static final String KEY_COLOR_EFFECT = "pref_camera_coloreffect_key"; public static final String KEY_VIDEOCAMERA_COLOR_EFFECT = "pref_camera_video_coloreffect_key"; public static final String KEY_FACE_DETECTION = "pref_camera_facedetection_key"; - public static final String KEY_TOUCH_AF_AEC = "pref_camera_touchafaec_key"; public static final String KEY_SELECTABLE_ZONE_AF = "pref_camera_selectablezoneaf_key"; public static final String KEY_SATURATION = "pref_camera_saturation_key"; public static final String KEY_CONTRAST = "pref_camera_contrast_key"; @@ -758,7 +757,6 @@ public class CameraSettings { ListPreference colorEffect = group.findPreference(KEY_COLOR_EFFECT); ListPreference camcorderColorEffect = group.findPreference(KEY_VIDEOCAMERA_COLOR_EFFECT); ListPreference faceDetection = group.findPreference(KEY_FACE_DETECTION); - ListPreference touchAfAec = group.findPreference(KEY_TOUCH_AF_AEC); ListPreference selectableZoneAf = group.findPreference(KEY_SELECTABLE_ZONE_AF); ListPreference saturation = group.findPreference(KEY_SATURATION); ListPreference contrast = group.findPreference(KEY_CONTRAST); @@ -835,11 +833,6 @@ public class CameraSettings { ListPreference videoRotation = group.findPreference(KEY_VIDEO_ROTATION); - if (touchAfAec != null) { - filterUnsupportedOptions(group, - touchAfAec, mParameters.getSupportedTouchAfAec()); - } - if (!mParameters.isPowerModeSupported() && powerMode != null) { removePreference(group, powerMode.getKey()); } diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 9554de7ff..24ffea253 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -237,7 +237,6 @@ public class PhotoMenu extends MenuController CameraSettings.KEY_ZSL, CameraSettings.KEY_TIMER_SOUND_EFFECTS, CameraSettings.KEY_FACE_RECOGNITION, - CameraSettings.KEY_TOUCH_AF_AEC, CameraSettings.KEY_SELECTABLE_ZONE_AF, CameraSettings.KEY_PICTURE_FORMAT, CameraSettings.KEY_ADVANCED_FEATURES, @@ -645,7 +644,6 @@ public class PhotoMenu extends MenuController || ((autohdr != null) && autohdr.equals("enable"))) { popup1.setPreferenceEnabled(CameraSettings.KEY_FOCUS_MODE, false); popup1.setPreferenceEnabled(CameraSettings.KEY_AUTOEXPOSURE, false); - popup1.setPreferenceEnabled(CameraSettings.KEY_TOUCH_AF_AEC, false); popup1.setPreferenceEnabled(CameraSettings.KEY_SATURATION, false); popup1.setPreferenceEnabled(CameraSettings.KEY_CONTRAST, false); popup1.setPreferenceEnabled(CameraSettings.KEY_SHARPNESS, false); @@ -713,7 +711,6 @@ public class PhotoMenu extends MenuController popup1.setPreferenceEnabled(CameraSettings.KEY_REDEYE_REDUCTION, false); popup1.setPreferenceEnabled(CameraSettings.KEY_EXPOSURE, false); popup1.setPreferenceEnabled(CameraSettings.KEY_COLOR_EFFECT, false); - popup1.setPreferenceEnabled(CameraSettings.KEY_TOUCH_AF_AEC, false); popup1.setPreferenceEnabled(CameraSettings.KEY_SCENE_MODE, false); popup1.setPreferenceEnabled(CameraSettings.KEY_INSTANT_CAPTURE, false); setPreference(CameraSettings.KEY_CAMERA_HDR, mSettingOff); diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 590a11226..cef508505 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -191,7 +191,6 @@ public class PhotoModule extends BaseModule implements private boolean mAeLockSupported; private boolean mAwbLockSupported; private boolean mContinuousFocusSupported; - private boolean mTouchAfAecFlag; private boolean mLongshotSave = false; private boolean mRefocus = false; private boolean mLastPhotoTakenWithRefocus = false; @@ -333,7 +332,6 @@ public class PhotoModule extends BaseModule implements private FocusOverlayManager mFocusManager; private String mSceneMode; - private String mCurrTouchAfAec = Parameters.TOUCH_AF_AEC_ON; private String mSavedFlashMode = null; private final Handler mHandler = new MainHandler(); @@ -850,8 +848,6 @@ public class PhotoModule extends BaseModule implements mUI.setPreference(CameraSettings.KEY_ZSL, Parameters.ZSL_OFF); mUI.setPreference(CameraSettings.KEY_FACE_DETECTION, Parameters.FACE_DETECTION_OFF); - mUI.setPreference(CameraSettings.KEY_TOUCH_AF_AEC, - Parameters.TOUCH_AF_AEC_OFF); mUI.setPreference(CameraSettings.KEY_FOCUS_MODE, Parameters.FOCUS_MODE_AUTO); mUI.setPreference(CameraSettings.KEY_FLASH_MODE, @@ -1855,7 +1851,6 @@ public class PhotoModule extends BaseModule implements } private void updateCommonManual3ASettings() { - String touchAfAec = mParameters.TOUCH_AF_AEC_OFF; mSceneMode = Parameters.SCENE_MODE_AUTO; String flashMode = Parameters.FLASH_MODE_OFF; String redeyeReduction = mActivity.getString(R.string. @@ -1868,7 +1863,7 @@ public class PhotoModule extends BaseModule implements if (mManual3AEnabled > 0) { overrideCameraSettings(flashMode, null, null, - exposureCompensation, touchAfAec, + exposureCompensation, mParameters.getAutoExposure(), getSaturationSafe(), getContrastSafe(), @@ -1879,10 +1874,8 @@ public class PhotoModule extends BaseModule implements 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); @@ -1916,7 +1909,6 @@ public class PhotoModule extends BaseModule implements String focusMode = null; String colorEffect = null; String exposureCompensation = null; - String touchAfAec = null; boolean disableLongShot = false; String ubiFocusOn = mActivity.getString(R.string. @@ -2001,7 +1993,7 @@ public class PhotoModule extends BaseModule implements exposureCompensation = CameraSettings.EXPOSURE_DEFAULT_VALUE; overrideCameraSettings(null, null, focusMode, - exposureCompensation, touchAfAec, null, + exposureCompensation, null, null, null, null, colorEffect, sceneMode, redeyeReduction, aeBracketing); disableLongShot = true; @@ -2030,10 +2022,9 @@ public class PhotoModule extends BaseModule implements } exposureCompensation = Integer.toString(mParameters.getExposureCompensation()); - touchAfAec = mCurrTouchAfAec; overrideCameraSettings(null, whiteBalance, focusMode, - exposureCompensation, touchAfAec, + exposureCompensation, mParameters.getAutoExposure(), getSaturationSafe(), getContrastSafe(), @@ -2043,7 +2034,7 @@ public class PhotoModule extends BaseModule implements } else if (mFocusManager.isZslEnabled()) { focusMode = mParameters.getFocusMode(); overrideCameraSettings(null, null, focusMode, - exposureCompensation, touchAfAec, null, + exposureCompensation, null, null, null, null, colorEffect, sceneMode, redeyeReduction, aeBracketing); } else { @@ -2051,7 +2042,7 @@ public class PhotoModule extends BaseModule implements updateCommonManual3ASettings(); } else { overrideCameraSettings(null, null, focusMode, - exposureCompensation, touchAfAec, null, + exposureCompensation, null, null, null, null, colorEffect, sceneMode, redeyeReduction, aeBracketing); } @@ -2118,17 +2109,16 @@ public class PhotoModule extends BaseModule implements 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, @@ -2796,10 +2786,6 @@ public class PhotoModule extends BaseModule implements || 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; mFocusManager.onSingleTapUp(x, y); @@ -3183,21 +3169,6 @@ public class PhotoModule extends BaseModule implements String optizoomOn = mActivity.getString(R.string .pref_camera_advanced_feature_value_optizoom_on); - try { - if(mParameters.getTouchAfAec().equals(mParameters.TOUCH_AF_AEC_ON)) - this.mTouchAfAecFlag = true; - else - this.mTouchAfAecFlag = false; - } catch(Exception e){ - Log.e(TAG, "Handled NULL pointer Exception"); - } - - // Set Touch AF/AEC parameter. - if (CameraUtil.isSupported(mParameters.TOUCH_AF_AEC_ON, - mParameters.getSupportedTouchAfAec())) { - mParameters.setTouchAfAec(mParameters.TOUCH_AF_AEC_ON); - } - // Set Picture Format // Picture Formats specified in UI should be consistent with // PIXEL_FORMAT_JPEG and PIXEL_FORMAT_RAW constants -- cgit v1.2.3