commit bdaa092a193d8ddccbd9ad8434be97878e6ded59
author Adam Lesinski <adamlesinski@google.com> Fri May 08 20:16:23 2015 -0700
committer Adam Lesinski <adamlesinski@google.com> Tue May 12 20:41:31 2015 -0700
tree 04310ae0b932078409147cbfa8332d96e76555d1
parent 330edcdf1316ed599fe0eb16a64330821fd92f18

AAPT2: inferred style parent processing

Change-Id: I8fbc4feef16b6039cf4c526fcfb767dc75a9c131

tools/aapt2/ResourceValues.h

diff --git a/tools/aapt2/ResourceValues.h b/tools/aapt2/ResourceValues.h
index b448bd8..ef6594e 100644
--- a/tools/aapt2/ResourceValues.h
+++ b/tools/aapt2/ResourceValues.h
@@ -232,12 +232,16 @@
         std::unique_ptr<Item> value;
     };
 
-    bool weak;
     Reference parent;
+
+    /**
+     * If set to true, the parent was auto inferred from the
+     * style's name.
+     */
+    bool parentInferred = false;
+
     std::vector<Entry> entries;
 
-    Style(bool weak);
-    bool isWeak() const override;
     Style* clone(StringPool* newPool) const override;
     void print(std::ostream& out) const override;
 };