From bdaa092a193d8ddccbd9ad8434be97878e6ded59 Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Fri, 8 May 2015 20:16:23 -0700 Subject: AAPT2: inferred style parent processing Change-Id: I8fbc4feef16b6039cf4c526fcfb767dc75a9c131 --- tools/aapt2/ResourceValues.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'tools/aapt2/ResourceValues.cpp') diff --git a/tools/aapt2/ResourceValues.cpp b/tools/aapt2/ResourceValues.cpp index be0c3f366a10..aabb375e6c5e 100644 --- a/tools/aapt2/ResourceValues.cpp +++ b/tools/aapt2/ResourceValues.cpp @@ -342,16 +342,10 @@ void Attribute::print(std::ostream& out) const { } } -Style::Style(bool weak) : weak(weak) { -} - -bool Style::isWeak() const { - return weak; -} - Style* Style::clone(StringPool* newPool) const { - Style* style = new Style(weak); + Style* style = new Style(); style->parent = parent; + style->parentInferred = parentInferred; for (auto& entry : entries) { style->entries.push_back(Entry{ entry.key, -- cgit v1.2.3-59-g8ed1b