summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Deepanshu Gupta <deepanshu@google.com> 2015-06-30 22:41:34 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-06-30 22:41:44 +0000
commitf5ca45baab32d83bd46a85917dc5521785cd2a89 (patch)
treef32a8d97159f2c971fbb2108e976531863e53c57
parent6ef5898793ea5cda3767c219bd8a2c564991747c (diff)
parent5d1eaf4a197130f561b16c4ed083cf016b20ab92 (diff)
Merge "Add missing resolveResValue call." into mnc-dev
-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 422b2aab0eb8..582ac33cb327 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
@@ -742,7 +742,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;
}