commit 30a67cd17af03e53b8be5638f7f70d2989a7cd78
author Deepanshu Gupta <deepanshu@google.com> Mon Feb 23 18:56:27 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 23 18:56:27 2015 +0000
tree 61be5d830664b29ff6c268ce38597b71d3cd5641
parent ab0f8ff740d314182ccc644f118a7f8ba6c4937e
parent 33c1c0779637cd1e90c671f35e6c1340301d44ab

Merge "Set forceFramework correctly for included layouts." into lmp-dev

tools/layoutlib/bridge/src/android/view/BridgeInflater.java

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 @@
                         XmlPullParser parser = ParserFactory.create(f);
 
                         BridgeXmlBlockParser bridgeParser = new BridgeXmlBlockParser(
-                                parser, bridgeContext, false);
+                                parser, bridgeContext, value.isFramework());
 
                         return inflate(bridgeParser, root);
                     } catch (Exception e) {