summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorcodeworkx <codeworkx@cyanogenmod.org>2016-01-05 23:35:42 +0100
committerDaniel Hillenbrand <codeworkx@cyanogenmod.org>2016-01-05 14:43:56 -0800
commitcdf6b80ad2d749212e6ce608f91d99c538f50d4c (patch)
tree5a9b51bf1c94412ea06c441b1f201090e783ab86 /src
parent42b5564ae11cd2c068d57802ed3735def1342c0f (diff)
downloadandroid_packages_apps_Snap-cdf6b80ad2d749212e6ce608f91d99c538f50d4c.tar.gz
android_packages_apps_Snap-cdf6b80ad2d749212e6ce608f91d99c538f50d4c.tar.bz2
android_packages_apps_Snap-cdf6b80ad2d749212e6ce608f91d99c538f50d4c.zip
option to set manufacturer specific parameters on startup
Change-Id: If734a7f4c25465876e657926700763b9169d786e
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/CameraHolder.java16
1 files changed, 11 insertions, 5 deletions
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);
}