From cd142092a0b3c947d0c5e429ec15985271b16259 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 --- res/values/qcomarrays.xml | 11 ------ res/values/qcomstrings.xml | 4 -- res/xml/camera_preferences.xml | 6 --- src/com/android/camera/CameraSettings.java | 7 ---- src/com/android/camera/PhotoMenu.java | 3 -- src/com/android/camera/PhotoModule.java | 59 ++++++------------------------ 6 files changed, 11 insertions(+), 79 deletions(-) diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml index 82406eaba..48e6e463d 100644 --- a/res/values/qcomarrays.xml +++ b/res/values/qcomarrays.xml @@ -298,17 +298,6 @@ AE-Bracket - - - @string/setting_off - @string/setting_on - - - - touch-off - touch-on - - @string/setting_off diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 650eb7259..c13e04321 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -257,10 +257,6 @@ Blue tint Green tint - - Touch AF/AEC - touch-on - Stabilization disable diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index 638431f9b..075367c79 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -163,12 +163,6 @@ camera:singleIcon="@drawable/ic_settings_quality" camera:entries="@array/pref_camera_jpegquality_entries" camera:entryValues="@array/pref_camera_jpegquality_entryvalues" /> - 0) { overrideCameraSettings(flashMode, null, null, - exposureCompensation, touchAfAec, + exposureCompensation, mParameters.getAutoExposure(), getSaturationSafe(), getContrastSafe(), @@ -1717,10 +1712,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); @@ -1754,7 +1747,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. @@ -1822,7 +1814,7 @@ public class PhotoModule exposureCompensation = CameraSettings.EXPOSURE_DEFAULT_VALUE; overrideCameraSettings(flashMode, null, focusMode, - exposureCompensation, touchAfAec, null, + exposureCompensation, null, null, null, null, colorEffect, sceneMode, redeyeReduction, aeBracketing); disableLongShot = true; @@ -1839,10 +1831,9 @@ public class PhotoModule colorEffect = mParameters.getColorEffect(); exposureCompensation = Integer.toString(mParameters.getExposureCompensation()); - touchAfAec = mCurrTouchAfAec; overrideCameraSettings(flashMode, whiteBalance, focusMode, - exposureCompensation, touchAfAec, + exposureCompensation, mParameters.getAutoExposure(), getSaturationSafe(), getContrastSafe(), @@ -1855,7 +1846,7 @@ public class PhotoModule } else if (mFocusManager.isZslEnabled()) { focusMode = mParameters.getFocusMode(); overrideCameraSettings(flashMode, null, focusMode, - exposureCompensation, touchAfAec, null, + exposureCompensation, null, null, null, null, colorEffect, sceneMode, redeyeReduction, aeBracketing); } else { @@ -1863,7 +1854,7 @@ public class PhotoModule updateCommonManual3ASettings(); } else { overrideCameraSettings(flashMode, null, focusMode, - exposureCompensation, touchAfAec, null, + exposureCompensation, null, null, null, null, colorEffect, sceneMode, redeyeReduction, aeBracketing); } @@ -1885,17 +1876,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, @@ -2519,10 +2509,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; mFocusManager.onSingleTapUp(x, y); @@ -2883,29 +2869,6 @@ public class PhotoModule mActivity.getString(R.string.pref_camera_longshot_default)); mParameters.set("long-shot", longshot_enable); - if (Parameters.SCENE_MODE_AUTO.equals(mSceneMode) || - CameraUtil.SCENE_MODE_HDR.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; - 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 -- cgit v1.2.3