am 1f6a21c2: Merge "Expose the TextAppearance.StatusBar.* styles." into gingerbread

Merge commit '1f6a21c2377f33a754222a34fa98ea1e21a6d27d' into gingerbread-plus-aosp

* commit '1f6a21c2377f33a754222a34fa98ea1e21a6d27d':
  Expose the TextAppearance.StatusBar.* styles.
This commit is contained in:
Joe Onorato
2010-09-07 14:46:08 -07:00
committed by Android Git Automerger
2 changed files with 50 additions and 44 deletions

View File

@@ -15838,6 +15838,50 @@
visibility="public"
>
</field>
<field name="TextAppearance_StatusBar_EventContent"
type="int"
transient="false"
volatile="false"
value="16973927"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="TextAppearance_StatusBar_EventContent_Title"
type="int"
transient="false"
volatile="false"
value="16973928"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="TextAppearance_StatusBar_Icon"
type="int"
transient="false"
volatile="false"
value="16973926"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="TextAppearance_StatusBar_Title"
type="int"
transient="false"
volatile="false"
value="16973925"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="TextAppearance_Theme"
type="int"
transient="false"
@@ -17059,50 +17103,6 @@
visibility="public"
>
</field>
<field name="kraken_resource_pad41"
type="int"
transient="false"
volatile="false"
value="16973928"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="kraken_resource_pad42"
type="int"
transient="false"
volatile="false"
value="16973927"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="kraken_resource_pad43"
type="int"
transient="false"
volatile="false"
value="16973926"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="kraken_resource_pad44"
type="int"
transient="false"
volatile="false"
value="16973925"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="kraken_resource_pad5"
type="int"
transient="false"

View File

@@ -1270,7 +1270,13 @@
<public-padding type="drawable" name="kraken_resource_pad" end="0x01080100" />
<public type="style" name="TextAppearance.StatusBar.Title" id="0x01030065" />
<public type="style" name="TextAppearance.StatusBar.Icon" id="0x01030066" />
<public type="style" name="TextAppearance.StatusBar.EventContent" id="0x01030067" />
<public type="style" name="TextAppearance.StatusBar.EventContent.Title" id="0x01030068" />
<public-padding type="style" name="kraken_resource_pad" end="0x01030090" />
<public-padding type="string" name="kraken_resource_pad" end="0x01040020" />
<public-padding type="integer" name="kraken_resource_pad" end="0x010e0010" />
<public-padding type="layout" name="kraken_resource_pad" end="0x01090020" />