summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2014-05-15 17:37:34 -0700
committerDeepanshu Gupta <deepanshu@google.com>2014-05-30 14:50:39 -0700
commit3b7c09b4336f421c489523c10278ecfbfb0708a7 (patch)
tree05b3b9549655d489027e46869ebddaae5a10d5b3 /tools
parent3a115628236ee9051518d4f96840cbb76070cf92 (diff)
downloadframeworks_base-3b7c09b4336f421c489523c10278ecfbfb0708a7.zip
frameworks_base-3b7c09b4336f421c489523c10278ecfbfb0708a7.tar.gz
frameworks_base-3b7c09b4336f421c489523c10278ecfbfb0708a7.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 08d2007b33838570a96c8df890f0757fa920904c)
Diffstat (limited to 'tools')
-rw-r--r--tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java2
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 78ae102..b857883 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
@@ -554,7 +554,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);