diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-08-19 12:56:10 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-08-20 12:56:42 -0700 |
| commit | 8a44bb23c1f12ba58d0cb5732e3e216d48e7ccdb (patch) | |
| tree | e3151310770488e74fe4ea201428a90ee8678787 /tools | |
| parent | ed23e3b87906d367304dbf5bd49ed17448d5d684 (diff) | |
| download | frameworks_base-8a44bb23c1f12ba58d0cb5732e3e216d48e7ccdb.zip frameworks_base-8a44bb23c1f12ba58d0cb5732e3e216d48e7ccdb.tar.gz frameworks_base-8a44bb23c1f12ba58d0cb5732e3e216d48e7ccdb.tar.bz2 | |
Update aapt to find fragment references.
Add knowledge about <fragment class="..."> for layout files
and update to reflect the change of the header tag from Header.
Change-Id: I91e2a5f204a8e222367985383c1721030c7954d8
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt/Resource.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp index 31c1722..498b193 100644 --- a/tools/aapt/Resource.cpp +++ b/tools/aapt/Resource.cpp @@ -2074,12 +2074,13 @@ writeProguardForLayouts(ProguardKeepSet* keep, const sp<AaptAssets>& assets) // tag:attribute pairs that should be checked in layout files. KeyedVector<String8, NamespaceAttributePair> kLayoutTagAttrPairs; addTagAttrPair(&kLayoutTagAttrPairs, "view", NULL, "class"); + addTagAttrPair(&kLayoutTagAttrPairs, "fragment", NULL, "class"); addTagAttrPair(&kLayoutTagAttrPairs, "fragment", RESOURCES_ANDROID_NAMESPACE, "name"); // tag:attribute pairs that should be checked in xml files. KeyedVector<String8, NamespaceAttributePair> kXmlTagAttrPairs; addTagAttrPair(&kXmlTagAttrPairs, "PreferenceScreen", RESOURCES_ANDROID_NAMESPACE, "fragment"); - addTagAttrPair(&kXmlTagAttrPairs, "Header", RESOURCES_ANDROID_NAMESPACE, "fragment"); + addTagAttrPair(&kXmlTagAttrPairs, "header", RESOURCES_ANDROID_NAMESPACE, "fragment"); const Vector<sp<AaptDir> >& dirs = assets->resDirs(); const size_t K = dirs.size(); |