diff options
| author | 2014-10-02 03:26:48 +0000 | |
|---|---|---|
| committer | 2014-10-02 03:26:49 +0000 | |
| commit | 76aff1f6ab84b8ac9f4a48ae7dff62ece00e1b97 (patch) | |
| tree | 2a46c183a33e20d7298b3766274182766e5d8b0e | |
| parent | 579338345721351313d4c3cd2a5114a0d135028d (diff) | |
| parent | 409bd3d77491359195b2c247d2863c26ca5a3c98 (diff) | |
Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java | 3 |
1 files changed, 1 insertions, 2 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 25e49b324369..c849a158c8ae 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 @@ -598,8 +598,7 @@ public final class BridgeContext extends Context { if (item != null) { // item is a reference to a style entry. Search for it. - item = mRenderResources.findResValue(item.getValue(), - false /*forceFrameworkOnly*/); + item = mRenderResources.findResValue(item.getValue(), item.isFramework()); if (item instanceof StyleResourceValue) { defStyleValues = (StyleResourceValue)item; |