Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996

Browse Source 
* commit '4a4d96e7ee682167861434cba05531f04642bf97':
  Remove errant tag terminator
  Normalize output of XMLtree content
This commit is contained in:
Conley Owens
2011-04-27 13:48:45 -07:00
committed by Android Git Automerger
parent f0556bb90f 4a4d96e7ee
commit 779fa1515d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/res/res/layout/contact_header.xml
View File

@@ -27,7 +27,6 @@
android:layout_marginRight="8dip" android:layout_marginRight="8dip"
android:layout_marginLeft="-1dip" android:layout_marginLeft="-1dip"
style="@*android:style/Widget.QuickContactBadge.WindowSmall" /> style="@*android:style/Widget.QuickContactBadge.WindowSmall" />
/>
<LinearLayout <LinearLayout
android:layout_width="0dip" android:layout_width="0dip"

3
tools/aapt/XMLNode.cpp
View File

@@ -504,7 +504,8 @@ void printXMLBlock(ResXMLTree* block)
namespaces.pop(); namespaces.pop();
} else if (code == ResXMLTree::TEXT) { } else if (code == ResXMLTree::TEXT) {
size_t len; 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());
} }
} }