am a1f5e82f: am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"

* commit 'a1f5e82f37c77af7b1d630b5bca715d1742f1234':
  Normalize output from aapt d
This commit is contained in:
Dianne Hackborn
2011-01-29 23:07:48 -08:00
committed by Android Git Automerger
3 changed files with 39 additions and 4 deletions

View File

@@ -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");
}