diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-05-15 17:37:34 -0700 |
|---|---|---|
| committer | Deepanshu Gupta <deepanshu@google.com> | 2014-05-30 14:49:59 -0700 |
| commit | 08d2007b33838570a96c8df890f0757fa920904c (patch) | |
| tree | a7e067e45feb1c4c0745f4fbbe908359b0738155 /tools | |
| parent | fe6f30491f8506a4b2ad895a0f3e68de180e4243 (diff) | |
| download | frameworks_base-08d2007b33838570a96c8df890f0757fa920904c.zip frameworks_base-08d2007b33838570a96c8df890f0757fa920904c.tar.gz frameworks_base-08d2007b33838570a96c8df890f0757fa920904c.tar.bz2 | |
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
?attr/foo in platform files wasn't resolved properly. The IDE checked
the app namespace for the attribute even though it is being referenced
from a platform file.
Change-Id: I7db6dfef5b540d99804c298120578da9d060b886
(cherry picked from commit a0fc1f46264e316449402525fbeb033138ec5f49)
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 3fcd987..efcb35c 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 @@ -560,7 +560,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); |