diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-05-16 18:04:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-16 18:04:15 +0000 |
| commit | 528d876821ea6760f6013e8714f77d8d40975d0d (patch) | |
| tree | 3296be8aef2b791d8777c88dc7ca6917420e617e /tools | |
| parent | a13bfae217553bcdd545794121c045f5a6da28ba (diff) | |
| parent | fba1dd24bf7b56071490ac62428f96d14f682244 (diff) | |
| download | frameworks_base-528d876821ea6760f6013e8714f77d8d40975d0d.zip frameworks_base-528d876821ea6760f6013e8714f77d8d40975d0d.tar.gz frameworks_base-528d876821ea6760f6013e8714f77d8d40975d0d.tar.bz2 | |
Merge "LayoutLib: Correctly resolve ?attr/foo"
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java | 2 |
1 files changed, 1 insertions, 1 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 08e9d99..fde4e1a 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 @@ -567,7 +567,7 @@ public final class BridgeContext extends Context { StyleResourceValue customStyleValues = null; if (customStyle != null) { ResourceValue item = mRenderResources.findResValue(customStyle, - false /*forceFrameworkOnly*/); + isPlatformFile /*forceFrameworkOnly*/); // resolve it in case it links to something else item = mRenderResources.resolveResValue(item); |