am 339716e0: am f99e27da: Merge "Make android:immersive public." into gingerbread

Merge commit '339716e03c293c1ab29492e38936643f08d797fa'

* commit '339716e03c293c1ab29492e38936643f08d797fa':
  Make android:immersive public.
This commit is contained in:
Daniel Sandler
2010-07-09 09:20:27 -07:00
committed by Android Git Automerger
2 changed files with 12 additions and 11 deletions

View File

@@ -4893,6 +4893,17 @@
visibility="public"
>
</field>
<field name="immersive"
type="int"
transient="false"
volatile="false"
value="16843457"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="inAnimation"
type="int"
transient="false"
@@ -6092,17 +6103,6 @@
visibility="public"
>
</field>
<field name="kraken_resource_pad64"
type="int"
transient="false"
volatile="false"
value="16843457"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="kraken_resource_pad7"
type="int"
transient="false"

View File

@@ -1246,6 +1246,7 @@
<public type="attr" name="logo" id="0x010102be" />
<public type="attr" name="xlargeScreens" id="0x010102bf" />
<public type="attr" name="heavyWeight" id="0x010102c0" />
<public type="attr" name="immersive" id="0x010102c1" />
<public-padding type="attr" name="kraken_resource_pad" end="0x01010300" />
<public-padding type="id" name="kraken_resource_pad" end="0x01020040" />