diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-02-23 19:22:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-23 19:22:31 +0000 |
| commit | 8f022fd323063f9cebb481be650db40cf5e486f3 (patch) | |
| tree | a594b464fadc398c4cafc6f8a39f6469bf05f20c /tools | |
| parent | 84e40b1f338eba0a352a6bf3a0f2801c21e17d59 (diff) | |
| parent | 5ed4fc9efda45d2411b8b9bc8cab55b8e270b13c (diff) | |
| download | frameworks_base-8f022fd323063f9cebb481be650db40cf5e486f3.zip frameworks_base-8f022fd323063f9cebb481be650db40cf5e486f3.tar.gz frameworks_base-8f022fd323063f9cebb481be650db40cf5e486f3.tar.bz2 | |
am 5ed4fc9e: am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev
* commit '5ed4fc9efda45d2411b8b9bc8cab55b8e270b13c':
Set forceFramework correctly for included layouts.
Diffstat (limited to 'tools')
| -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) { |