am fef09e8f: am 1005569f: Merge change 23012 into eclair

Merge commit 'fef09e8f98f61d3d89a3890f5917061fd6a73015'

* commit 'fef09e8f98f61d3d89a3890f5917061fd6a73015':
  Fix issue #2084148: Define the format for the auto focus preview for barcode scanning
This commit is contained in:
Dianne Hackborn
2009-08-27 17:02:50 -07:00
committed by Android Git Automerger
4 changed files with 74 additions and 9 deletions

View File

@@ -1663,7 +1663,7 @@
type="int"
transient="false"
volatile="false"
value="16843406"
value="16843407"
static="true"
final="true"
deprecated="not deprecated"
@@ -2664,7 +2664,7 @@
type="int"
transient="false"
volatile="false"
value="16843407"
value="16843408"
static="true"
final="true"
deprecated="not deprecated"
@@ -6422,6 +6422,17 @@
visibility="public"
>
</field>
<field name="required"
type="int"
transient="false"
volatile="false"
value="16843406"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="resizeable"
type="int"
transient="false"
@@ -7449,7 +7460,7 @@
type="int"
transient="false"
volatile="false"
value="16843414"
value="16843415"
static="true"
final="true"
deprecated="not deprecated"
@@ -8362,7 +8373,7 @@
type="int"
transient="false"
volatile="false"
value="16843408"
value="16843409"
static="true"
final="true"
deprecated="not deprecated"
@@ -8538,7 +8549,7 @@
type="int"
transient="false"
volatile="false"
value="16843412"
value="16843413"
static="true"
final="true"
deprecated="not deprecated"
@@ -8549,7 +8560,7 @@
type="int"
transient="false"
volatile="false"
value="16843413"
value="16843414"
static="true"
final="true"
deprecated="not deprecated"
@@ -8560,7 +8571,7 @@
type="int"
transient="false"
volatile="false"
value="16843410"
value="16843411"
static="true"
final="true"
deprecated="not deprecated"
@@ -8571,7 +8582,7 @@
type="int"
transient="false"
volatile="false"
value="16843411"
value="16843412"
static="true"
final="true"
deprecated="not deprecated"
@@ -8780,7 +8791,7 @@
type="int"
transient="false"
volatile="false"
value="16843409"
value="16843410"
static="true"
final="true"
deprecated="not deprecated"