diff options
author | Xavier Ducrohet <xav@android.com> | 2011-06-28 18:55:42 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-28 18:55:42 -0700 |
commit | 9bce27a9ce916bdf363667ee67fc0ce50c533aa3 (patch) | |
tree | 1946628579b2bd45a0ba2b48440151a2ba68d7df | |
parent | 155cf6c1e191bb03fe24db8663715862d8e6a43d (diff) | |
parent | 4753498d5c1ac3cf93b0730e77946a95b6913a82 (diff) | |
download | frameworks_base-9bce27a9ce916bdf363667ee67fc0ce50c533aa3.zip frameworks_base-9bce27a9ce916bdf363667ee67fc0ce50c533aa3.tar.gz frameworks_base-9bce27a9ce916bdf363667ee67fc0ce50c533aa3.tar.bz2 |
am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread
* commit '4753498d5c1ac3cf93b0730e77946a95b6913a82':
CherryPick 06942bc4 from hc-mr1. do not merge.
-rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java | 11 | ||||
-rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeResources.java | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java index 7e13bb1..904f7a3 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java @@ -296,12 +296,17 @@ public final class BridgeContext extends Activity { public Pair<View, Boolean> inflateView(ResourceReference resource, ViewGroup parent, boolean attachToRoot, boolean skipCallbackParser) { - String layoutName = resource.getName(); boolean isPlatformLayout = resource.isFramework(); if (isPlatformLayout == false && skipCallbackParser == false) { // check if the project callback can provide us with a custom parser. - ILayoutPullParser parser = mProjectCallback.getParser(layoutName); + ILayoutPullParser parser; + if (resource instanceof ResourceValue) { + parser = mProjectCallback.getParser((ResourceValue) resource); + } else { + parser = mProjectCallback.getParser(resource.getName()); + } + if (parser != null) { BridgeXmlBlockParser blockParser = new BridgeXmlBlockParser(parser, this, resource.isFramework()); @@ -369,7 +374,7 @@ public final class BridgeContext extends Activity { } else { Bridge.getLog().error(LayoutLog.TAG_BROKEN, String.format("Layout %s%s does not exist.", isPlatformLayout ? "android:" : "", - layoutName), null); + resource.getName()), null); } return Pair.of(null, false); diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeResources.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeResources.java index ca44f6e..d0b90fb 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeResources.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeResources.java @@ -234,7 +234,7 @@ public final class BridgeResources extends Resources { try { // check if the current parser can provide us with a custom parser. if (mPlatformResourceFlag[0] == false) { - parser = mProjectCallback.getParser(value.getName()); + parser = mProjectCallback.getParser(value); } // create a new one manually if needed. |