Normalize output of XMLtree content

Shachar Shemesh · Shachar Shemesh · commit 7c94b34b5241 · 2011-04-11T13:32:19.000+03:00
Make the output from aapt dump xmltree normalized, so that it is unambigously
displayed regardless of the content of the strings. Previous patch left out
handling of XML element content.

Change-Id: Ib8016996c769f3dde7a87f7ecbdf850333f2426a
diff --git a/tools/aapt/XMLNode.cpp b/tools/aapt/XMLNode.cpp
@@ -504,7 +504,8 @@ void printXMLBlock(ResXMLTree* block)
             namespaces.pop();
         } else if (code == ResXMLTree::TEXT) {
             size_t len;
-            printf("%sC: \"%s\"\n", prefix.string(), String8(block->getText(&len)).string());
+            printf("%sC: \"%s\"\n", prefix.string(), ResTable::normalizeForOutput(
+                        String8(block->getText(&len)).string()).string());
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -504,7 +504,8 @@ void printXMLBlock(ResXMLTree* block)`
`504`	`504`	`namespaces.pop();`
`505`	`505`	`} else if (code == ResXMLTree::TEXT) {`
`506`	`506`	`size_t len;`
`507`		`- printf("%sC: \"%s\"\n", prefix.string(), String8(block->getText(&len)).string());`
	`507`	`+ printf("%sC: \"%s\"\n", prefix.string(), ResTable::normalizeForOutput(`
	`508`	`+ String8(block->getText(&len)).string()).string());`
`508`	`509`	`}`
`509`	`510`	`}`
`510`	`511`