diff options
| author | Dianne Hackborn <hackbod@android.com> | 2011-01-29 23:07:48 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-29 23:07:48 -0800 |
| commit | 371de9695508073fbbde8181eb230e99cb045206 (patch) | |
| tree | 8b725299fe6b9638dad8cc3dc538a23ae86377ac /tools | |
| parent | bda99568d84530c6442af0602e9c12e6cb897780 (diff) | |
| parent | a1f5e82f37c77af7b1d630b5bca715d1742f1234 (diff) | |
| download | frameworks_base-371de9695508073fbbde8181eb230e99cb045206.zip frameworks_base-371de9695508073fbbde8181eb230e99cb045206.tar.gz frameworks_base-371de9695508073fbbde8181eb230e99cb045206.tar.bz2 | |
am a1f5e82f: am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"
* commit 'a1f5e82f37c77af7b1d630b5bca715d1742f1234':
Normalize output from aapt d
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt/XMLNode.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/aapt/XMLNode.cpp b/tools/aapt/XMLNode.cpp index 8551b0f..c0d7427 100644 --- a/tools/aapt/XMLNode.cpp +++ b/tools/aapt/XMLNode.cpp @@ -451,13 +451,15 @@ void printXMLBlock(ResXMLTree* block) printf("=?0x%x", (int)value.data); } else if (value.dataType == Res_value::TYPE_STRING) { printf("=\"%s\"", - String8(block->getAttributeStringValue(i, &len)).string()); + ResTable::normalizeForOutput(String8(block->getAttributeStringValue(i, + &len)).string()).string()); } else { printf("=(type 0x%x)0x%x", (int)value.dataType, (int)value.data); } const char16_t* val = block->getAttributeStringValue(i, &len); if (val != NULL) { - printf(" (Raw: \"%s\")", String8(val).string()); + printf(" (Raw: \"%s\")", ResTable::normalizeForOutput(String8(val).string()). + string()); } printf("\n"); } |