summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2015-08-26 20:20:11 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-26 20:20:11 +0000
commitc5c2ea04780ddf77c37618f7ed37d575a5cd0744 (patch)
tree451b77698a924241423a1487bacf336e0e4316c8 /tools
parente4acf0ad4a83b22ea0ac4ecc23b41864df84714a (diff)
parent9a13b1e7502734fbe54d6f0e1c386f5382dfa662 (diff)
downloadframeworks_base-c5c2ea04780ddf77c37618f7ed37d575a5cd0744.zip
frameworks_base-c5c2ea04780ddf77c37618f7ed37d575a5cd0744.tar.gz
frameworks_base-c5c2ea04780ddf77c37618f7ed37d575a5cd0744.tar.bz2
am 9a13b1e7: am db67caa6: Add missing resolveResValue call. [DO NOT MERGE]
* commit '9a13b1e7502734fbe54d6f0e1c386f5382dfa662': Add missing resolveResValue call. [DO NOT MERGE]
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 62e0f0b..9de908e 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
@@ -708,7 +708,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(), item.isFramework());
-
+ item = mRenderResources.resolveResValue(item);
if (item instanceof StyleResourceValue) {
defStyleValues = (StyleResourceValue) item;
}