Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a44bb23 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

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
parent ed23e3b8

tools/aapt/Resource.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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();