From: Dianne Hackborn <hackbod@google.com>
Date: Thu, 19 Aug 2010 19:56:10 +0000 (-0700)
Subject: Update aapt to find fragment references.
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/0fe8adeb654f45cbc6f61e070b002d981cf5d18e

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

diff --git a/Resource.cpp b/Resource.cpp
index 31c1722..498b193 100644
--- a/Resource.cpp
+++ b/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();