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

am dfe25b0e: Merge "LayoutLib: support for custom styles." into eclair

Browse Source 
Merge commit 'dfe25b0e0c382d04a59bb03c7f5f8689ece5395e' into eclair-plus-aosp

* commit 'dfe25b0e0c382d04a59bb03c7f5f8689ece5395e':
  LayoutLib: support for custom styles.
This commit is contained in:
Xavier Ducrohet
2010-01-11 15:28:07 -08:00
committed by Android Git Automerger
parent 495d820c01 dfe25b0e0c
commit f5a84f8a7f
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java
View File

@@ -259,7 +259,18 @@ public final class BridgeContext extends Context {
// resolve the defStyleAttr value into a IStyleResourceValue // resolve the defStyleAttr value into a IStyleResourceValue
IStyleResourceValue defStyleValues = null; IStyleResourceValue defStyleValues = null;
if (defStyleAttr != 0) {
// look for a custom style.
String customStyle = parser.getAttributeValue(null /* namespace*/, "style");
if (customStyle != null) {
IResourceValue item = findResValue(customStyle);
if (item instanceof IStyleResourceValue) {
defStyleValues = (IStyleResourceValue)item;
}
}
if (defStyleValues == null && defStyleAttr != 0) {
// get the name from the int. // get the name from the int.
String defStyleName = searchAttr(defStyleAttr); String defStyleName = searchAttr(defStyleAttr);