From 409bd3d77491359195b2c247d2863c26ca5a3c98 Mon Sep 17 00:00:00 2001 From: Deepanshu Gupta Date: Fri, 19 Sep 2014 14:29:02 -0700 Subject: [PATCH] Resource resolution bug fix. [DO NOT MERGE] Fix a bug where "?attr/foo" in framework resources wasn't resolved properly. Change-Id: I9a56974f526774fde79685f668f01021136d68f1 (cherry picked from commit 19c7842082d831ad432abe906f4c37c6ed08e414) --- .../bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java | 3 +-- 1 file changed, 1 insertion(+), 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; -- 2.11.0