Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e5dd62e8: am 2fd73a45: Unhide camera metering mode API.

Browse Source 
Merge commit 'e5dd62e873448fd8c1fd8e80739b58bda649a6e7'

* commit 'e5dd62e873448fd8c1fd8e80739b58bda649a6e7':
  Unhide camera metering mode API.
This commit is contained in:
Wu-cheng Li
2010-06-11 00:35:06 -07:00
committed by Android Git Automerger
parent 9e30a6e374 e5dd62e873
commit 6df7225660
2 changed files with 70 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
api/current.xml
View File

@@ -78625,6 +78625,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"
@@ -78757,6 +78768,17 @@
visibility="public"
>
</method>
<method name="getSupportedMeteringModes"
return="java.util.List&lt;java.lang.String&gt;"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getSupportedPictureFormats"
return="java.util.List&lt;java.lang.Integer&gt;"
abstract="false"
@@ -79125,6 +79147,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"
@@ -79556,6 +79591,39 @@
visibility="public"
>
</field>
<field name="METERING_MODE_CENTER_WEIGHTED"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;center-weighted&quot;"
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="&quot;frame-average&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="METERING_MODE_SPOT"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;spot&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_ACTION"
type="java.lang.String"
transient="false"
@@ -80841,7 +80909,7 @@
type="float"
transient="false"
volatile="false"
value="0.001f"
value="0.0010f"
static="true"
final="true"
deprecated="not deprecated"
@@ -223060,7 +223128,7 @@
deprecated="not deprecated"
visibility="public"
>
<parameter name="t" type="T">
<parameter name="arg0" type="T">
</parameter>
</method>
</interface>