Merge "Camera: add ISO mode support" into cm-10.1 (f2cfa224) · Commits · e / os / android_frameworks_base

core/java/android/hardware/Camera.java

+50 −0

Original line number	Diff line number	Diff line
		@@ -1685,6 +1685,7 @@ public class Camera {
		private static final String KEY_SCENE_MODE = "scene-mode";
		private static final String KEY_FLASH_MODE = "flash-mode";
		private static final String KEY_FOCUS_MODE = "focus-mode";
		private static final String KEY_ISO_MODE = "iso";
		private static final String KEY_FOCUS_AREAS = "focus-areas";
		private static final String KEY_MAX_NUM_FOCUS_AREAS = "max-num-focus-areas";
		private static final String KEY_FOCAL_LENGTH = "focal-length";
		@@ -1778,6 +1779,22 @@ public class Camera {
		*/
		public static final String FLASH_MODE_TORCH = "torch";

		//Values for ISO settings
		/** @hide */
		public static final String ISO_AUTO = "auto";
		/** @hide */
		public static final String ISO_HJR = "ISO_HJR";
		/** @hide */
		public static final String ISO_100 = "ISO100";
		/** @hide */
		public static final String ISO_200 = "ISO200";
		/** @hide */
		public static final String ISO_400 = "ISO400";
		/** @hide */
		public static final String ISO_800 = "ISO800";
		/** @hide */
		public static final String ISO_1600 = "ISO1600";

		/**
		* Scene mode is off.
		*/
		@@ -3287,6 +3304,39 @@ public class Camera {
		return TRUE.equals(str);
		}

		/**
		* Gets the current ISO setting.
		*
		* @return one of ISO_XXX string constant. null if ISO
		* setting is not supported.
		* @hide
		*/
		public String getISOValue() {
		return get(KEY_ISO_MODE);
		}

		/**
		* Sets the ISO.
		*
		* @param iso ISO_XXX string constant.
		* @hide
		*/
		public void setISOValue(String iso) {
		set(KEY_ISO_MODE, iso);
		}

		/**
		* Gets the supported ISO values.
		*
		* @return a List of ISO_MODE_XXX string constants. null if iso mode
		* setting is not supported.
		* @hide
		*/
		public List<String> getSupportedIsoValues() {
		String str = get(KEY_ISO_MODE + SUPPORTED_VALUES_SUFFIX);
		return split(str);
		}

		/**
		* <p>Gets the distances from the camera to where an object appears to be
		* in focus. The object is sharpest at the optimal focus distance. The