Remove camera metering mode API. (7ec7b997) · Commits · e / os / android_frameworks_base

api/current.xml

+0 −68

Original line number	Diff line number	Diff line
		@@ -76023,17 +76023,6 @@
		visibility="public"
		>
		</method>
		<method name="getMeteringMode"
		return="java.lang.String"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getMinExposureCompensation"
		return="int"
		abstract="false"
		@@ -76179,17 +76168,6 @@
		visibility="public"
		>
		</method>
		<method name="getSupportedMeteringModes"
		return="java.util.List<java.lang.String>"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getSupportedPictureFormats"
		return="java.util.List<java.lang.Integer>"
		abstract="false"
		@@ -76569,19 +76547,6 @@
		<parameter name="height" type="int">
		</parameter>
		</method>
		<method name="setMeteringMode"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="value" type="java.lang.String">
		</parameter>
		</method>
		<method name="setPictureFormat"
		return="void"
		abstract="false"
		@@ -77028,39 +76993,6 @@
		visibility="public"
		>
		</field>
		<field name="METERING_MODE_CENTER_WEIGHTED"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""center-weighted""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="METERING_MODE_FRAME_AVERAGE"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""frame-average""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="METERING_MODE_SPOT"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""spot""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="PREVIEW_FPS_MAX_INDEX"
		type="int"
		transient="false"

core/java/android/hardware/Camera.java

+0 −55

Original line number	Diff line number	Diff line
		@@ -993,7 +993,6 @@ public class Camera {
		private static final String KEY_ZOOM_SUPPORTED = "zoom-supported";
		private static final String KEY_SMOOTH_ZOOM_SUPPORTED = "smooth-zoom-supported";
		private static final String KEY_FOCUS_DISTANCES = "focus-distances";
		private static final String KEY_METERING_MODE = "metering-mode";

		// Parameter key suffix for supported values.
		private static final String SUPPORTED_VALUES_SUFFIX = "-values";
		@@ -1202,24 +1201,6 @@ public class Camera {
		*/
		public static final int FOCUS_DISTANCE_FAR_INDEX = 2;

		/**
		* The camera determines the exposure by giving more weight to the
		* central part of the scene.
		*/
		public static final String METERING_MODE_CENTER_WEIGHTED = "center-weighted";

		/**
		* The camera determines the exposure by averaging the entire scene,
		* giving no weighting to any particular area.
		*/
		public static final String METERING_MODE_FRAME_AVERAGE = "frame-average";

		/**
		* The camera determines the exposure by a very small area of the scene,
		* typically the center.
		*/
		public static final String METERING_MODE_SPOT = "spot";

		/**
		* The array index of minimum preview fps for use with {@link
		* #getPreviewFpsRange(int[])} or {@link
		@@ -2263,42 +2244,6 @@ public class Camera {
		splitFloat(get(KEY_FOCUS_DISTANCES), output);
		}

		/**
		* Gets the supported metering modes.
		*
		* @return a list of supported metering modes. null if metering mode
		* setting is not supported.
		* @see #getMeteringMode()
		*/
		public List<String> getSupportedMeteringModes() {
		String str = get(KEY_METERING_MODE + SUPPORTED_VALUES_SUFFIX);
		return split(str);
		}

		/**
		* Gets the current metering mode, which affects how camera determines
		* exposure.
		*
		* @return current metering mode. If the camera does not support
		* metering setting, this should return null.
		* @see #METERING_MODE_CENTER_WEIGHTED
		* @see #METERING_MODE_FRAME_AVERAGE
		* @see #METERING_MODE_SPOT
		*/
		public String getMeteringMode() {
		return get(KEY_METERING_MODE);
		}

		/**
		* Sets the metering mode.
		*
		* @param value metering mode.
		* @see #getMeteringMode()
		*/
		public void setMeteringMode(String value) {
		set(KEY_METERING_MODE, value);
		}

		// Splits a comma delimited string to an ArrayList of String.
		// Return null if the passing string is null or the size is 0.
		private ArrayList<String> split(String str) {

include/camera/CameraParameters.h

+0 −17

Original line number	Diff line number	Diff line
		@@ -286,13 +286,6 @@ public:
		// Example value: "yuv420sp" or PIXEL_FORMAT_XXX constants. Read only.
		static const char KEY_VIDEO_FRAME_FORMAT[];

		// Metering mode. This affects how camera determines exposure.
		// Example value: "spot" or METERING_MODE_XXX constants. Read/write.
		static const char KEY_METERING_MODE[];
		// Supported metering modes.
		// Example value: "center-weighted,frame-average,spot". Read only.
		static const char KEY_SUPPORTED_METERING_MODES[];

		// Value for KEY_ZOOM_SUPPORTED or KEY_SMOOTH_ZOOM_SUPPORTED.
		static const char TRUE[];

		@@ -394,16 +387,6 @@ public:
		// focus, applications should change the focus mode to other modes.
		static const char FOCUS_MODE_CONTINUOUS[];

		// The camera determines the exposure by giving more weight to the
		// central part of the scene.
		static const char METERING_MODE_CENTER_WEIGHTED[];
		// The camera determines the exposure by averaging the entire scene,
		// giving no weighting to any particular area.
		static const char METERING_MODE_FRAME_AVERAGE[];
		// The camera determines the exposure by a very small area of the scene,
		// typically the center.
		static const char METERING_MODE_SPOT[];

		private:
		DefaultKeyedVector<String8,String8> mMap;
		};

libs/camera/CameraParameters.cpp

+0 −7

Original line number	Diff line number	Diff line
		@@ -73,8 +73,6 @@ const char CameraParameters::KEY_ZOOM_SUPPORTED[] = "zoom-supported";
		const char CameraParameters::KEY_SMOOTH_ZOOM_SUPPORTED[] = "smooth-zoom-supported";
		const char CameraParameters::KEY_FOCUS_DISTANCES[] = "focus-distances";
		const char CameraParameters::KEY_VIDEO_FRAME_FORMAT[] = "video-frame-format";
		const char CameraParameters::KEY_METERING_MODE[] = "metering-mode";
		const char CameraParameters::KEY_SUPPORTED_METERING_MODES[] = "metering-mode-values";

		const char CameraParameters::TRUE[] = "true";
		const char CameraParameters::FOCUS_DISTANCE_INFINITY[] = "Infinity";
		@@ -146,11 +144,6 @@ const char CameraParameters::FOCUS_MODE_FIXED[] = "fixed";
		const char CameraParameters::FOCUS_MODE_EDOF[] = "edof";
		const char CameraParameters::FOCUS_MODE_CONTINUOUS[] = "continuous";

		// Values for metering mode settings.
		const char CameraParameters::METERING_MODE_CENTER_WEIGHTED[] = "center-weighted";
		const char CameraParameters::METERING_MODE_FRAME_AVERAGE[] = "frame-average";
		const char CameraParameters::METERING_MODE_SPOT[] = "spot";

		CameraParameters::CameraParameters()
		: mMap()
		{