diff options
| author | 2011-04-27 14:53:10 -0700 | |
|---|---|---|
| committer | 2011-04-27 14:53:10 -0700 | |
| commit | 8279c193d1e7cd3b9bcc371feaf73e204cf251e5 (patch) | |
| tree | f3d29e19d0e7ad076b280b338d51d356fe7758d4 | |
| parent | ac505b86b45462d9883f9c36fad0ef85e0885ee4 (diff) | |
| parent | 779fa1515d0b6cf17a449dc79f83a7c4e70ff0fe (diff) | |
am 779fa151: am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996
* commit '779fa1515d0b6cf17a449dc79f83a7c4e70ff0fe':
Remove errant tag terminator
Normalize output of XMLtree content
| -rw-r--r-- | core/res/res/layout/contact_header.xml | 1 | ||||
| -rw-r--r-- | tools/aapt/XMLNode.cpp | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/res/res/layout/contact_header.xml b/core/res/res/layout/contact_header.xml index bf467d3f8c05..dfa9af4f7175 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" /> - /> <LinearLayout android:layout_width="0dip" diff --git a/tools/aapt/XMLNode.cpp b/tools/aapt/XMLNode.cpp index c0d74275a8a6..19248bf7fe37 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()); } } |