diff options
| -rw-r--r-- | res/values/config.xml | 4 | ||||
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 15 | ||||
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 6 | ||||
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 3 | ||||
| -rw-r--r-- | src/com/android/camera/util/CameraUtil.java | 16 |
5 files changed, 0 insertions, 44 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index f8ca5032..9bb3b8b7 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -31,10 +31,6 @@ <!-- Cancel autofocus if preview stopped. If camera HAL does not support it set this value to false --> <bool name="cancelAutoFocusOnPreviewStopped">true</bool> - <!-- Samsung Camcorder Mode --> - <bool name="needsSamsungCamMode">false</bool> - <!-- HTC Camcorder Mode --> - <bool name="needsHTCCamMode">false</bool> <!-- Ordered list of detected scene modes This should reference the list in camera_asd_values and diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 361fdb00..08aa9e20 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -947,21 +947,6 @@ public class CameraSettings { return isBeautyModeSupported(params) && (Integer.valueOf(params.get("face-beautify")) > 0); } - /** - * Enable video mode for certain cameras. - * - * @param params - * @param on - */ - public static void setVideoMode(Parameters params, boolean on) { - if (CameraUtil.useSamsungCamMode()) { - params.set("cam_mode", on ? "1" : "0"); - } - if (CameraUtil.useHTCCamMode()) { - params.set("cam-mode", on ? "1" : "0"); - } - } - public static List<String> getSupportedSlowShutter(Parameters params) { String p = params.get("exposure-time-values"); if (p != null) { diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index a22c9f57..5a1013b6 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2288,10 +2288,6 @@ public class PhotoModule mCameraDevice.setMetadataCallback(mHandler, mASDCallback); } - // Set camera mode - CameraSettings.setVideoMode(mParameters, false); - mCameraDevice.setParameters(mParameters); - } else if (mBurstShotsDone > 0) { mHandler.post(mDoSnapRunnable); } @@ -2875,8 +2871,6 @@ public class PhotoModule if ((updateSet & UPDATE_PARAM_INITIALIZE) != 0) { updateCameraParametersInitialize(); - // Set camera mode - CameraSettings.setVideoMode(mParameters, false); } if ((updateSet & UPDATE_PARAM_ZOOM) != 0) { diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 7398cd54..72e5b32d 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -2170,9 +2170,6 @@ public class VideoModule implements CameraModule, mParameters.setPreviewFrameRate(mProfile.videoFrameRate); } - // Set video mode - CameraSettings.setVideoMode(mParameters, true); - forceFlashOffIfSupported(!mPreviewFocused); videoWidth = mProfile.videoFrameWidth; diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java index 9c42194a..eab9177b 100644 --- a/src/com/android/camera/util/CameraUtil.java +++ b/src/com/android/camera/util/CameraUtil.java @@ -222,12 +222,6 @@ public class CameraUtil { // Get available hardware keys private static int sDeviceKeysPresent; - // Samsung camcorder mode - private static boolean sSamsungCamMode; - - // HTC camcorder mode - private static boolean sHTCCamMode; - private CameraUtil() { } @@ -247,8 +241,6 @@ public class CameraUtil { sSamsungHDRFormat = context.getResources().getBoolean(R.bool.needsSamsungHDRFormat); sDeviceKeysPresent = context.getResources().getInteger( com.android.internal.R.integer.config_deviceHardwareKeys); - sSamsungCamMode = context.getResources().getBoolean(R.bool.needsSamsungCamMode); - sHTCCamMode = context.getResources().getBoolean(R.bool.needsHTCCamMode); sASDModes = context.getResources().getStringArray(R.array.asdModes); sEnableHDRWithZSL = context.getResources().getBoolean(R.bool.enableHDRWithZSL); sEnableHistogram = context.getResources().getBoolean(R.bool.enableHistogram); @@ -266,14 +258,6 @@ public class CameraUtil { return sNoFocusModeChangeForTouch; } - public static boolean useHTCCamMode() { - return sHTCCamMode; - } - - public static boolean useSamsungCamMode() { - return sSamsungCamMode; - } - public static boolean isHDRWithZSLEnabled() { return sEnableHDRWithZSL; } |