diff options
| author | Daniel Sandler <dsandler@android.com> | 2010-07-09 06:10:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-09 06:10:26 -0700 |
| commit | 339716e03c293c1ab29492e38936643f08d797fa (patch) | |
| tree | 69ea95f2e18a496d22e1a2e9aaa9fb2dc4cadd5d | |
| parent | 4f4406322dafd6e128b437edbc541327f0b38d04 (diff) | |
| parent | f99e27da0b2e8d9f6be205b20191581c7951dfbc (diff) | |
| download | frameworks_base-339716e03c293c1ab29492e38936643f08d797fa.zip frameworks_base-339716e03c293c1ab29492e38936643f08d797fa.tar.gz frameworks_base-339716e03c293c1ab29492e38936643f08d797fa.tar.bz2 | |
am f99e27da: Merge "Make android:immersive public." into gingerbread
Merge commit 'f99e27da0b2e8d9f6be205b20191581c7951dfbc' into gingerbread-plus-aosp
* commit 'f99e27da0b2e8d9f6be205b20191581c7951dfbc':
Make android:immersive public.
| -rw-r--r-- | api/current.xml | 22 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 1 |
2 files changed, 12 insertions, 11 deletions
diff --git a/api/current.xml b/api/current.xml index 5aa8604..8717b7a 100644 --- a/api/current.xml +++ b/api/current.xml @@ -4717,6 +4717,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" @@ -5916,17 +5927,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" diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 27cb763..6c13da6 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -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" /> |