diff options
| author | 2015-02-24 04:52:35 +0000 | |
|---|---|---|
| committer | 2015-02-24 04:52:35 +0000 | |
| commit | a13ca400d17750321ac66f6362d7467a3f21d845 (patch) | |
| tree | e30c23cd5f8eb24554545a6303dd20e959ea2f4f | |
| parent | 32adbd3524210c20ba794751f390befaffefd212 (diff) | |
| parent | 01d5286f388303551a2eb8f57e210f6d7a690cb5 (diff) | |
am 01d5286f: am 8f022fd3: am 5ed4fc9e: am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev
* commit '01d5286f388303551a2eb8f57e210f6d7a690cb5':
Set forceFramework correctly for included layouts.
| -rw-r--r-- | tools/layoutlib/bridge/src/android/view/BridgeInflater.java | 2 |
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 36102f1123e0..7e4ff6983315 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) { |