Add namespace handling in attribute values
Previously, you could only reference namespace prefixes in attribute names:
<View xmlns:appcompat="http://schemas.android.com/apk/res/android.support.v7.appcompat"
appcompat:name="hey"
...
Now you can also reference them in resource names within an attribute value:
...
android:text="@appcompat:string/confirm"
...
Which will be treated as "@android.support.v7.appcompat:string/confirm".
Change-Id: Ib076e867a990c80cf877a704eb77cd1ef0b23b52
diff --git a/tools/aapt2/ScopedXmlPullParser.h b/tools/aapt2/ScopedXmlPullParser.h
index e660499..a040f60 100644
--- a/tools/aapt2/ScopedXmlPullParser.h
+++ b/tools/aapt2/ScopedXmlPullParser.h
@@ -52,25 +52,27 @@
ScopedXmlPullParser& operator=(const ScopedXmlPullParser&) = delete;
~ScopedXmlPullParser();
- Event getEvent() const;
- const std::string& getLastError() const;
- Event next();
+ Event getEvent() const override;
+ const std::string& getLastError() const override;
+ Event next() override;
- const std::u16string& getComment() const;
- size_t getLineNumber() const;
- size_t getDepth() const;
+ const std::u16string& getComment() const override;
+ size_t getLineNumber() const override;
+ size_t getDepth() const override;
- const std::u16string& getText() const;
+ const std::u16string& getText() const override;
- const std::u16string& getNamespacePrefix() const;
- const std::u16string& getNamespaceUri() const;
+ const std::u16string& getNamespacePrefix() const override;
+ const std::u16string& getNamespaceUri() const override;
+ bool applyPackageAlias(std::u16string* package, const std::u16string& defaultPackage)
+ const override;
- const std::u16string& getElementNamespace() const;
- const std::u16string& getElementName() const;
+ const std::u16string& getElementNamespace() const override;
+ const std::u16string& getElementName() const override;
- const_iterator beginAttributes() const;
- const_iterator endAttributes() const;
- size_t getAttributeCount() const;
+ const_iterator beginAttributes() const override;
+ const_iterator endAttributes() const override;
+ size_t getAttributeCount() const override;
private:
XmlPullParser* mParser;