diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-02-23 19:09:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-23 19:09:14 +0000 |
| commit | 99142d298213e93f673057c2334b04b38f7e4450 (patch) | |
| tree | edcab3f8015da30a79df2f688db98a188b232d86 | |
| parent | 3570268bcf1e4c375d8b592714f8b7be25819873 (diff) | |
| parent | 3f8e2b9302fba0ace67fb0459d6ffb0884c4d80b (diff) | |
| download | frameworks_base-99142d298213e93f673057c2334b04b38f7e4450.zip frameworks_base-99142d298213e93f673057c2334b04b38f7e4450.tar.gz frameworks_base-99142d298213e93f673057c2334b04b38f7e4450.tar.bz2 | |
am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev
* commit '3f8e2b9302fba0ace67fb0459d6ffb0884c4d80b':
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 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) { |