From cdf6b80ad2d749212e6ce608f91d99c538f50d4c Mon Sep 17 00:00:00 2001 From: codeworkx Date: Tue, 5 Jan 2016 23:35:42 +0100 Subject: option to set manufacturer specific parameters on startup Change-Id: If734a7f4c25465876e657926700763b9169d786e --- src/com/android/camera/CameraHolder.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/com/android/camera/CameraHolder.java b/src/com/android/camera/CameraHolder.java index 780008315..ee62eb2f6 100644 --- a/src/com/android/camera/CameraHolder.java +++ b/src/com/android/camera/CameraHolder.java @@ -231,11 +231,17 @@ public class CameraHolder { mCameraId = cameraId; mParameters = mCameraDevice.getCamera().getParameters(); - // LGE Camera - final boolean lgeCamera = context.getResources().getBoolean(R.bool.lge_camera); - if (lgeCamera && mParameters != null) { - Log.d(TAG, "Set parameter lge-camera = 1"); - mParameters.set("lge-camera", "1"); + // Manufacturer specific key values + String manufacturerKeyValues = context.getResources().getString(R.string.manufacturer_key_values); + if (manufacturerKeyValues != null && !manufacturerKeyValues.isEmpty()) { + String[] keyValuesArray = manufacturerKeyValues.split(";"); + for (String kvPair : keyValuesArray) { + String[] manufacturerParamPair = kvPair.split("="); + if (!manufacturerParamPair[0].isEmpty() && !manufacturerParamPair[1].isEmpty()) { + Log.d(TAG, "Set manufacturer specific parameter " + manufacturerParamPair[0] + "=" + manufacturerParamPair[1]); + mParameters.set(manufacturerParamPair[0], manufacturerParamPair[1]); + } + } mCameraDevice.setParameters(mParameters); } -- cgit v1.2.3