commit 2b46b7eed71231b6def62c4d30810a6ad56c25e6
author Deepanshu Gupta <deepanshu@google.com> Tue Jun 24 10:33:38 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 24 10:33:38 2014 +0000
tree 834545f128a1d5cee92e6bbc38bdd88ca13d021f
parent 08b59fcb217d06d10fc67f376ebfa183d8d759db
parent d6bb0820550787ecc5f0fd4b084b88ab4a34a08e

am cd4b38ea: Merge "Resource resolution bug fix." into lmp-preview-dev

* commit 'cd4b38ea1d3605e0e62e5ddc70c052e221fef73c':
  Resource resolution bug fix.

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java

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 5c51c63..efd55bf 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 @@
 
             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;