diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-10-18 18:41:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-18 18:41:12 -0700 |
| commit | 69a19fdbff6aff8875d87e27c9b1047d0a3f44c1 (patch) | |
| tree | 35f95af916a26b528fdb2abee1904c542409c2a5 /core/res | |
| parent | c9cff071af175e559339c54876136612ac5eda3b (diff) | |
| parent | 3d2818d34feab5a62dfb33452f99f2d3ca667cc8 (diff) | |
| download | frameworks_base-69a19fdbff6aff8875d87e27c9b1047d0a3f44c1.zip frameworks_base-69a19fdbff6aff8875d87e27c9b1047d0a3f44c1.tar.gz frameworks_base-69a19fdbff6aff8875d87e27c9b1047d0a3f44c1.tar.bz2 | |
am 3d2818d3: Remove public resource padding.
Merge commit '3d2818d34feab5a62dfb33452f99f2d3ca667cc8' into gingerbread-plus-aosp
* commit '3d2818d34feab5a62dfb33452f99f2d3ca667cc8':
Remove public resource padding.
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/public.xml | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index cc91fb7..5531d47 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -1261,11 +1261,6 @@ <public type="attr" name="textSelectHandleWindowStyle" id="0x010102c8" /> <public type="attr" name="popupAnimationStyle" id="0x010102c9" /> - <public-padding type="attr" name="kraken_resource_pad" end="0x01010300" /> - - <public-padding type="id" name="kraken_resource_pad" end="0x01020040" /> - <public-padding type="anim" name="kraken_resource_pad" end="0x010a0020" /> - <!-- presence drawables for videochat or audiochat capable contacts --> <public type="drawable" name="presence_video_away" id="0x010800ac" /> <public type="drawable" name="presence_video_busy" id="0x010800ad" /> @@ -1274,19 +1269,9 @@ <public type="drawable" name="presence_audio_busy" id="0x010800b0" /> <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" /> - <public-padding type="dimen" name="kraken_resource_pad" end="0x01050010" /> - <public-padding type="color" name="kraken_resource_pad" end="0x01060020" /> - <public-padding type="array" name="kraken_resource_pad" end="0x01070010" /> + </resources> |