summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2010-04-10 11:42:15 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-10 11:42:15 -0700
commit08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c (patch)
tree4fed99924b11236a3ac616b84bfa12071626a0a6 /api
parent67d6590d242397acbb95814139301d2e6efd3631 (diff)
parentc58b42327df5fbc826e2fcc2674ab6db0edfcd92 (diff)
downloadframeworks_base-08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c.zip
frameworks_base-08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c.tar.gz
frameworks_base-08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c.tar.bz2
am c58b4232: Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
Merge commit 'c58b42327df5fbc826e2fcc2674ab6db0edfcd92' into froyo-plus-aosp * commit 'c58b42327df5fbc826e2fcc2674ab6db0edfcd92': Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
Diffstat (limited to 'api')
-rw-r--r--api/current.xml22
1 files changed, 22 insertions, 0 deletions
diff --git a/api/current.xml b/api/current.xml
index 61666ad..98a9d3b 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -72876,6 +72876,17 @@
visibility="public"
>
</field>
+<field name="FOCUS_MODE_EDOF"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;edof&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
<field name="FOCUS_MODE_FIXED"
type="java.lang.String"
transient="false"
@@ -72931,6 +72942,17 @@
visibility="public"
>
</field>
+<field name="SCENE_MODE_BARCODE"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;barcode&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
<field name="SCENE_MODE_BEACH"
type="java.lang.String"
transient="false"