From 7c94b34b5241b548d68a1cb03d10f697386aac65 Mon Sep 17 00:00:00 2001 From: Shachar Shemesh Date: Mon, 11 Apr 2011 13:32:19 +0300 Subject: [PATCH 1/2] Normalize output of XMLtree content 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 --- tools/aapt/XMLNode.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/aapt/XMLNode.cpp b/tools/aapt/XMLNode.cpp index c0d74275a8a6a..19248bf7fe373 100644 --- 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()); } } From 0cd48ae3de0609089b8adf532d947a41fc418786 Mon Sep 17 00:00:00 2001 From: Shachar Shemesh Date: Mon, 11 Apr 2011 13:48:35 +0300 Subject: [PATCH 2/2] Remove errant tag terminator Element android.widget.QuickContactBadge had two closing markers. Change-Id: I0ab47e2fc999b4cf09fa10a7f5df58090816e315 --- core/res/res/layout/contact_header.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/core/res/res/layout/contact_header.xml b/core/res/res/layout/contact_header.xml index bf467d3f8c050..dfa9af4f71750 100644 --- a/core/res/res/layout/contact_header.xml +++ b/core/res/res/layout/contact_header.xml @@ -27,7 +27,6 @@ android:layout_marginRight="8dip" android:layout_marginLeft="-1dip" style="@*android:style/Widget.QuickContactBadge.WindowSmall" /> - />