drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9b6a8ab8: Add camera parameters constants and methods.

Browse Source 
Merge commit '9b6a8ab8221f2df20c32711b0f1e4f301165fac2' into eclair-plus-aosp

* commit '9b6a8ab8221f2df20c32711b0f1e4f301165fac2':
  Add camera parameters constants and methods.
This commit is contained in:
Wu-cheng Li
2009-09-01 22:01:00 -07:00
committed by Android Git Automerger
parent 9073dc69b1 9b6a8ab822
commit eb05398fcc
2 changed files with 1426 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

820
api/current.xml
View File

@ -65052,6 +65052,39 @@
<parameter name="key" type="java.lang.String">
</parameter>
</method>
<method name="getAntibanding"
return="java.lang.String"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getColorEffect"
return="java.lang.String"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getFlashMode"
return="java.lang.String"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getInt"
return="int"
abstract="false"
@ -65065,6 +65098,39 @@
<parameter name="key" type="java.lang.String">
</parameter>
</method>
<method name="getJpegQuality"
return="int"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getJpegThumbnailQuality"
return="int"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getJpegThumbnailSize"
return="android.hardware.Camera.Size"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getPictureFormat"
return="int"
abstract="false"
@ -65120,6 +65186,138 @@
visibility="public"
>
</method>
<method name="getSceneMode"
return="java.lang.String"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getSupportedAntibanding"
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="getSupportedColorEffects"
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="getSupportedFlashModes"
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"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getSupportedPictureSizes"
return="java.util.List&lt;android.hardware.Camera.Size&gt;"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getSupportedPreviewFormats"
return="java.util.List&lt;java.lang.Integer&gt;"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getSupportedPreviewFrameRates"
return="java.util.List&lt;java.lang.Integer&gt;"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getSupportedPreviewSizes"
return="java.util.List&lt;android.hardware.Camera.Size&gt;"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getSupportedSceneModes"
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="getSupportedWhiteBalance"
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="getWhiteBalance"
return="java.lang.String"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="remove"
return="void"
abstract="false"
@ -65133,6 +65331,17 @@
<parameter name="key" type="java.lang.String">
</parameter>
</method>
<method name="removeGpsData"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="set"
return="void"
abstract="false"
@ -65163,6 +65372,138 @@
<parameter name="value" type="int">
</parameter>
</method>
<method name="setAntibanding"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="antibanding" type="java.lang.String">
</parameter>
</method>
<method name="setColorEffect"
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="setFlashMode"
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="setGpsAltitude"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="altitude" type="double">
</parameter>
</method>
<method name="setGpsLatitude"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="latitude" type="double">
</parameter>
</method>
<method name="setGpsLongitude"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="longitude" type="double">
</parameter>
</method>
<method name="setGpsTimestamp"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="timestamp" type="long">
</parameter>
</method>
<method name="setJpegQuality"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="quality" type="int">
</parameter>
</method>
<method name="setJpegThumbnailQuality"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="quality" type="int">
</parameter>
</method>
<method name="setJpegThumbnailSize"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="width" type="int">
</parameter>
<parameter name="height" type="int">
</parameter>
</method>
<method name="setPictureFormat"
return="void"
abstract="false"
@ -65232,6 +65573,45 @@
<parameter name="height" type="int">
</parameter>
</method>
<method name="setRotation"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="rotation" type="int">
</parameter>
</method>
<method name="setSceneMode"
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="setWhiteBalance"
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="unflatten"
return="void"
abstract="false"
@ -65245,6 +65625,446 @@
<parameter name="flattened" type="java.lang.String">
</parameter>
</method>
<field name="ANTIBANDING_50HZ"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;50hz&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="ANTIBANDING_60HZ"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;60hz&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="ANTIBANDING_AUTO"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;auto&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="ANTIBANDING_OFF"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;off&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="EFFECT_AQUA"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;aqua&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="EFFECT_BLACKBOARD"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;blackboard&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="EFFECT_MONO"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;mono&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="EFFECT_NEGATIVE"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;negative&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="EFFECT_NONE"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;none&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="EFFECT_POSTERIZE"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;posterize&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="EFFECT_SEPIA"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;sepia&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="EFFECT_SOLARIZE"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;solarize&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="EFFECT_WHITEBOARD"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;whiteboard&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="FLASH_MODE_AUTO"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;auto&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="FLASH_MODE_OFF"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;off&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="FLASH_MODE_ON"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;on&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="FLASH_MODE_RED_EYE"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;red-eye&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_ACTION"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;action&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_AUTO"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;auto&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_BEACH"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;beach&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_CANDLELIGHT"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;candlelight&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_FIREWORKS"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;fireworks&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_LANDSCAPE"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;landscape&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_NIGHT"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;night&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_NIGHT_PORTRAIT"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;night-portrait&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_PARTY"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;party&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_PORTRAIT"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;portrait&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_SNOW"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;snow&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_SPORTS"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;sports&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_STEADYPHOTO"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;steadyphoto&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_SUNSET"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;sunset&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SCENE_MODE_THEATRE"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;theatre&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="WHITE_BALANCE_AUTO"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;auto&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="WHITE_BALANCE_CLOUDY_DAYLIGHT"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;cloudy-daylight&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="WHITE_BALANCE_DAYLIGHT"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;daylight&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="WHITE_BALANCE_FLUORESCENT"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;fluorescent&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="WHITE_BALANCE_INCANDESCENT"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;incandescent&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="WHITE_BALANCE_SHADE"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;shade&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="WHITE_BALANCE_TWILIGHT"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;twilight&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="WHITE_BALANCE_WARM_FLUORESCENT"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;warm-fluorescent&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
</class>
<interface name="Camera.PictureCallback"
abstract="true"

760
core/java/android/hardware/Camera.java
View File

File diff suppressed because it is too large Load Diff