merge in jb-release history after reset to jb-dev

[android/aapt.git] / XMLNode.h

diff --git a/XMLNode.h b/XMLNode.h
index dc92fa7c620b3715ed9fc3a5c7b1db0a617a92ba..05624b7451766e8cb830210533214f0418f3511d 100644 (file)
--- a/XMLNode.h
+++ b/XMLNode.h
@@ -25,6 +25,7 @@ status_t parseStyledString(Bundle* bundle,
                            const String16& endTag,
                            String16* outString,
                            Vector<StringPool::entry_style_span>* outSpans,
+                           bool isFormatted,
                            bool isPseudolocalizable);
 
 void printXMLBlock(ResXMLTree* block);
@@ -95,6 +96,8 @@ public:
 
     const attribute_entry* getAttribute(const String16& ns, const String16& name) const;
     
+    attribute_entry* editAttribute(const String16& ns, const String16& name);
+
     const String16& getCData() const;
 
     const String16& getComment() const;