diff options
author | Xavier Ducrohet <xav@google.com> | 2010-01-11 15:28:07 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-11 15:28:07 -0800 |
commit | f5a84f8a7f91422f698ffbea3fabf77f2f7f77c8 (patch) | |
tree | 9219d2277935c710b470730fc363d188cc6d4319 /tools | |
parent | 495d820c0124a811b9352b93ce4fe88c716f259d (diff) | |
parent | dfe25b0e0c382d04a59bb03c7f5f8689ece5395e (diff) | |
download | frameworks_base-f5a84f8a7f91422f698ffbea3fabf77f2f7f77c8.zip frameworks_base-f5a84f8a7f91422f698ffbea3fabf77f2f7f77c8.tar.gz frameworks_base-f5a84f8a7f91422f698ffbea3fabf77f2f7f77c8.tar.bz2 |
am dfe25b0e: Merge "LayoutLib: support for custom styles." into eclair
Merge commit 'dfe25b0e0c382d04a59bb03c7f5f8689ece5395e' into eclair-plus-aosp
* commit 'dfe25b0e0c382d04a59bb03c7f5f8689ece5395e':
LayoutLib: support for custom styles.
Diffstat (limited to 'tools')
-rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java index 1e9f573..b670eee 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java @@ -259,7 +259,18 @@ public final class BridgeContext extends Context { // resolve the defStyleAttr value into a IStyleResourceValue 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. String defStyleName = searchAttr(defStyleAttr); @@ -1104,7 +1115,7 @@ public final class BridgeContext extends Context { Bundle initialExtras) { // TODO Auto-generated method stub } - + @Override public void setTheme(int arg0) { // TODO Auto-generated method stub @@ -1137,7 +1148,7 @@ public final class BridgeContext extends Context { throws IntentSender.SendIntentException { // TODO Auto-generated method stub } - + @Override public boolean startInstrumentation(ComponentName arg0, String arg1, Bundle arg2) { |