diff options
| -rw-r--r-- | res/values/config.xml | 5 | ||||
| -rw-r--r-- | src/com/android/camera/CameraHolder.java | 16 |
2 files changed, 14 insertions, 7 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index c1d4df2bb..cba2df45f 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -35,8 +35,9 @@ <!-- Opens front camera using openLegacy() --> <bool name="front_camera_open_legacy">true</bool> - <!-- Set's parameter "lge-camera" for LGE devices. --> - <bool name="lge_camera">false</bool> + <!-- Set's manufacturer specific parameters on startup. + Example: lge-camera=1;cam-mode=0 --> + <string name="manufacturer_key_values"></string> <!-- Use following iso parameter. Example: lg-iso 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); } |