diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-08-27 18:09:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-27 18:09:48 -0700 |
| commit | 7fe6d3f13ae18a85c09bf38ea1f3281280a9fd48 (patch) | |
| tree | 0bf8ce2c5fe5236dde1cdaf5572cb2e3ca5a87c6 /api | |
| parent | bf88d55b9f413b58072de6e7d3e3ccdcf1dd3672 (diff) | |
| parent | 705c2e66dcb358c865cf912a5496825088044b79 (diff) | |
| download | frameworks_base-7fe6d3f13ae18a85c09bf38ea1f3281280a9fd48.zip frameworks_base-7fe6d3f13ae18a85c09bf38ea1f3281280a9fd48.tar.gz frameworks_base-7fe6d3f13ae18a85c09bf38ea1f3281280a9fd48.tar.bz2 | |
am 705c2e66: am d851e6fe: Merge "Unhide camera fps range API and deprecate old ones." into gingerbread
Merge commit '705c2e66dcb358c865cf912a5496825088044b79'
* commit '705c2e66dcb358c865cf912a5496825088044b79':
Unhide camera fps range API and deprecate old ones.
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.xml | 69 |
1 files changed, 65 insertions, 4 deletions
diff --git a/api/current.xml b/api/current.xml index 3120561..aba3c92 100644 --- a/api/current.xml +++ b/api/current.xml @@ -83363,6 +83363,19 @@ visibility="public" > </method> +<method name="getPreviewFpsRange" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="range" type="int[]"> +</parameter> +</method> <method name="getPreviewFrameRate" return="int" abstract="false" @@ -83370,7 +83383,7 @@ synchronized="false" static="false" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </method> @@ -83495,6 +83508,17 @@ visibility="public" > </method> +<method name="getSupportedPreviewFpsRange" + return="java.util.List<int[]>" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getSupportedPreviewFrameRates" return="java.util.List<java.lang.Integer>" abstract="false" @@ -83502,7 +83526,7 @@ synchronized="false" static="false" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > </method> @@ -83884,7 +83908,7 @@ <parameter name="pixel_format" type="int"> </parameter> </method> -<method name="setPreviewFrameRate" +<method name="setPreviewFpsRange" return="void" abstract="false" native="false" @@ -83894,6 +83918,21 @@ deprecated="not deprecated" visibility="public" > +<parameter name="min" type="int"> +</parameter> +<parameter name="max" type="int"> +</parameter> +</method> +<method name="setPreviewFrameRate" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="deprecated" + visibility="public" +> <parameter name="fps" type="int"> </parameter> </method> @@ -84307,6 +84346,28 @@ visibility="public" > </field> +<field name="PREVIEW_FPS_MAX_INDEX" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="PREVIEW_FPS_MIN_INDEX" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="SCENE_MODE_ACTION" type="java.lang.String" transient="false" @@ -85698,7 +85759,7 @@ type="float" transient="false" volatile="false" - value="0.001f" + value="0.0010f" static="true" final="true" deprecated="not deprecated" |