diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-05-23 19:07:18 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2011-05-24 10:55:30 -0700 |
| commit | 34f5991ebe8b203f1720caf95889c15dd131d86e (patch) | |
| tree | 373d328201332a614bf871f051505d9d00a6bcdc /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| 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
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions