summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/values/qcomarrays.xml11
-rw-r--r--res/values/qcomstrings.xml4
-rw-r--r--res/xml/camera_preferences.xml6
-rw-r--r--src/com/android/camera/CameraSettings.java7
-rw-r--r--src/com/android/camera/PhotoMenu.java3
-rw-r--r--src/com/android/camera/PhotoModule.java59
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 @@
<item>AE-Bracket</item>
</string-array>
- <!-- Touch AF/AEC -->
- <string-array name="pref_camera_touchafaec_entries" translatable="false">
- <item>@string/setting_off</item>
- <item>@string/setting_on</item>
- </string-array>
-
- <string-array name="pref_camera_touchafaec_entryvalues" translatable="false">
- <item>touch-off</item>
- <item>touch-on</item>
- </string-array>
-
<!-- Stabilization -->
<string-array name="pref_camera_dis_entries" translatable="false">
<item>@string/setting_off</item>
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 @@
<string name="pref_camera_coloreffect_entry_bluetint">Blue tint</string>
<string name="pref_camera_coloreffect_entry_greentint">Green tint</string>
- <!-- Touch AF/AEC -->
- <string name="pref_camera_touchafaec_title">Touch AF/AEC</string>
- <string name="pref_camera_touchafaec_default" translatable="false">touch-on</string>
-
<!-- Stabilization -->
<string name="pref_camera_dis_title">Stabilization</string>
<string name="pref_camera_dis_default" translatable="false">disable</string>
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" />
- <ListPreference
- camera:key="pref_camera_touchafaec_key"
- camera:defaultValue="@string/pref_camera_touchafaec_default"
- camera:title="@string/pref_camera_touchafaec_title"
- camera:entries="@array/pref_camera_touchafaec_entries"
- camera:entryValues="@array/pref_camera_touchafaec_entryvalues" />
<IconListPreference
camera:key="pref_camera_iso_key"
camera:defaultValue="@string/pref_camera_iso_default"
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 3e8accb1e..dbfdd049a 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -87,7 +87,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";
@@ -646,7 +645,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);
@@ -716,11 +714,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 8684dbced..4c766995c 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -183,7 +183,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_SATURATION,
@@ -619,7 +618,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);
@@ -682,7 +680,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);
setPreference(CameraSettings.KEY_CAMERA_HDR, mSettingOff);
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 2a7d6b9cf..9616961a1 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -191,7 +191,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;
@@ -333,7 +332,6 @@ public class PhotoModule
private FocusOverlayManager mFocusManager;
private String mSceneMode;
- private String mCurrTouchAfAec = Parameters.TOUCH_AF_AEC_ON;
private final Handler mHandler = new MainHandler();
private MessageQueue.IdleHandler mIdleHandler = null;
@@ -768,8 +766,6 @@ public class PhotoModule
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,
@@ -1693,7 +1689,6 @@ public class PhotoModule
}
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.
@@ -1706,7 +1701,7 @@ public class PhotoModule
if (mManual3AEnabled > 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 14:03:59 +0000