| commit | 34f5991ebe8b203f1720caf95889c15dd131d86e | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Mon May 23 19:07:18 2011 -0700 |
| committer | Xavier Ducrohet <xav@android.com> | Tue May 24 10:55:30 2011 -0700 |
| tree | 373d328201332a614bf871f051505d9d00a6bcdc | |
| parent | c7b87766b21fe5cf2f644efa8753b936d413dc9a [diff] |
Merge 6103e22c from honeycomb-mr1. do not merge. LayoutLib: custom styles override the default style instead of replacing it. Intead of reading either the custom or the default style for a widget, we read both and use the values from the custom style if it exists, or from the default style otherwise. Change-Id: Ibcec2e9b1e8a95295ab26ede145c287ff2f30be4