Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a4d96e7 authored by Conley Owens's avatar Conley Owens Committed by Android Code Review
Browse files

Merge changes I0ab47e2f,Ib8016996 

* changes:
  Remove errant tag terminator
  Normalize output of XMLtree content
parents 86d1d747 0cd48ae3

core/res/res/layout/contact_header.xml

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
        android:layout_marginRight="8dip"

        android:layout_marginLeft="-1dip"

        style="@*android:style/Widget.QuickContactBadge.WindowSmall" />

    />



    <LinearLayout

        android:layout_width="0dip"

tools/aapt/XMLNode.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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());

        }

    }