diff options
| author | Joe Onorato <joeo@google.com> | 2010-09-07 14:46:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-07 14:46:08 -0700 |
| commit | d348ea6e0ad3fc029a01c214da4ad4b8d856c4f9 (patch) | |
| tree | 582d5743e0661f4b2f8ba07de42d4485edce9d71 /core/res | |
| parent | 3f6e4d56bba393ac556a672202e00bc417784ce8 (diff) | |
| parent | 1f6a21c2377f33a754222a34fa98ea1e21a6d27d (diff) | |
| download | frameworks_base-d348ea6e0ad3fc029a01c214da4ad4b8d856c4f9.zip frameworks_base-d348ea6e0ad3fc029a01c214da4ad4b8d856c4f9.tar.gz frameworks_base-d348ea6e0ad3fc029a01c214da4ad4b8d856c4f9.tar.bz2 | |
am 1f6a21c2: Merge "Expose the TextAppearance.StatusBar.* styles." into gingerbread
Merge commit '1f6a21c2377f33a754222a34fa98ea1e21a6d27d' into gingerbread-plus-aosp
* commit '1f6a21c2377f33a754222a34fa98ea1e21a6d27d':
Expose the TextAppearance.StatusBar.* styles.
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/public.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index de419be..86e79c8 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -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" /> |