summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2015-02-23 09:18:08 -0800
committerDeepanshu Gupta <deepanshu@google.com>2015-02-23 17:26:12 +0000
commit33c1c0779637cd1e90c671f35e6c1340301d44ab (patch)
treebe7277837ccc710059e3101ed8ee98a1ee66ccf2 /tools
parenta91f6d0003d852fc744ce4ce3a14b0786ac2f26f (diff)
downloadframeworks_base-33c1c0779637cd1e90c671f35e6c1340301d44ab.zip
frameworks_base-33c1c0779637cd1e90c671f35e6c1340301d44ab.tar.gz
frameworks_base-33c1c0779637cd1e90c671f35e6c1340301d44ab.tar.bz2
Set forceFramework correctly for included layouts.
Bug: http://b.android.com/151326 Change-Id: I759f6e1a7a1c83bbbb771ddbb92843a105acffa4
Diffstat (limited to 'tools')
-rw-r--r--tools/layoutlib/bridge/src/android/view/BridgeInflater.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/layoutlib/bridge/src/android/view/BridgeInflater.java b/tools/layoutlib/bridge/src/android/view/BridgeInflater.java
index 36102f1..7e4ff69 100644
--- a/tools/layoutlib/bridge/src/android/view/BridgeInflater.java
+++ b/tools/layoutlib/bridge/src/android/view/BridgeInflater.java
@@ -179,7 +179,7 @@ public final class BridgeInflater extends LayoutInflater {
XmlPullParser parser = ParserFactory.create(f);
BridgeXmlBlockParser bridgeParser = new BridgeXmlBlockParser(
- parser, bridgeContext, false);
+ parser, bridgeContext, value.isFramework());
return inflate(bridgeParser, root);
} catch (Exception e) {