diff options
| -rw-r--r-- | api/current.xml | 72 | ||||
| -rw-r--r-- | core/java/android/hardware/Camera.java | 6 |
2 files changed, 70 insertions, 8 deletions
diff --git a/api/current.xml b/api/current.xml index fed772f86623..8dd57f034a64 100644 --- a/api/current.xml +++ b/api/current.xml @@ -75764,6 +75764,17 @@ 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" @@ -75896,6 +75907,17 @@ 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" @@ -76264,6 +76286,19 @@ <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" @@ -76695,6 +76730,39 @@ 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="SCENE_MODE_ACTION" type="java.lang.String" transient="false" @@ -77980,7 +78048,7 @@ type="float" transient="false" volatile="false" - value="0.001f" + value="0.0010f" static="true" final="true" deprecated="not deprecated" @@ -218911,7 +218979,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="t" type="T"> +<parameter name="arg0" type="T"> </parameter> </method> </interface> diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 025db4ae9e93..5c96a44dede0 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -969,21 +969,18 @@ public class Camera { /** * The camera determines the exposure by giving more weight to the * central part of the scene. - * @hide */ 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. - * @hide */ 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. - * @hide */ public static final String METERING_MODE_SPOT = "spot"; @@ -1957,7 +1954,6 @@ public class Camera { * @return a list of supported metering modes. null if metering mode * setting is not supported. * @see #getMeteringMode() - * @hide */ public List<String> getSupportedMeteringModes() { String str = get(KEY_METERING_MODE + SUPPORTED_VALUES_SUFFIX); @@ -1973,7 +1969,6 @@ public class Camera { * @see #METERING_MODE_CENTER_WEIGHTED * @see #METERING_MODE_FRAME_AVERAGE * @see #METERING_MODE_SPOT - * @hide */ public String getMeteringMode() { return get(KEY_METERING_MODE); @@ -1984,7 +1979,6 @@ public class Camera { * * @param value metering mode. * @see #getMeteringMode() - * @hide */ public void setMeteringMode(String value) { set(KEY_METERING_MODE, value); |