Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'd348ea6e0ad3fc029a01c214da4ad4b8d856c4f9' into manual-merge

Browse Source 
Conflicts:
	core/res/res/values/public.xml

Change-Id: Id80cc50b669d7ea840d28839431126023980e5a1
This commit is contained in:
Ying Wang
2010-09-07 18:39:03 -07:00
parent c24ffe6fdc d348ea6e0a
commit 7d8bb82dca
2 changed files with 50 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
api/current.xml
View File

@@ -16482,6 +16482,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"
@@ -17824,50 +17868,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"

6
core/res/res/values/public.xml
View File

@@ -1265,7 +1265,13 @@
<public type="drawable" name="presence_audio_online" id="0x010800b1" />
<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" />