Merge "Fix writing text version of styleable IDs. do not merge." into jb-mr1-dev

[android/aapt.git] / ResourceTable.h

diff --git a/ResourceTable.h b/ResourceTable.h
index 665232bb6d0dab5b18969ddd9788fd87a19ebea7..a3e066690fba4e747480f9aec8f61c1bc7a643b2 100644 (file)
--- a/ResourceTable.h
+++ b/ResourceTable.h
@@ -24,6 +24,7 @@ enum {
     XML_COMPILE_COMPACT_WHITESPACE = 1<<2,
     XML_COMPILE_STRIP_WHITESPACE = 1<<3,
     XML_COMPILE_STRIP_RAW_VALUES = 1<<4,
     XML_COMPILE_COMPACT_WHITESPACE = 1<<2,
     XML_COMPILE_STRIP_WHITESPACE = 1<<3,
     XML_COMPILE_STRIP_RAW_VALUES = 1<<4,

+    XML_COMPILE_UTF8 = 1<<5,

     
     XML_COMPILE_STANDARD_RESOURCE =
             XML_COMPILE_STRIP_COMMENTS | XML_COMPILE_ASSIGN_ATTRIBUTE_IDS
     
     XML_COMPILE_STANDARD_RESOURCE =
             XML_COMPILE_STRIP_COMMENTS | XML_COMPILE_ASSIGN_ATTRIBUTE_IDS


@@ -35,6 +36,12 @@ status_t compileXmlFile(const sp<AaptAssets>& assets,
                         ResourceTable* table,
                         int options = XML_COMPILE_STANDARD_RESOURCE);
 
                         ResourceTable* table,
                         int options = XML_COMPILE_STANDARD_RESOURCE);
 

+status_t compileXmlFile(const sp<AaptAssets>& assets,
+                        const sp<AaptFile>& target,
+                        const sp<AaptFile>& outTarget,
+                        ResourceTable* table,
+                        int options = XML_COMPILE_STANDARD_RESOURCE);
+

 status_t compileXmlFile(const sp<AaptAssets>& assets,
                         const sp<XMLNode>& xmlTree,
                         const sp<AaptFile>& target,
 status_t compileXmlFile(const sp<AaptAssets>& assets,
                         const sp<XMLNode>& xmlTree,
                         const sp<AaptFile>& target,


@@ -69,6 +76,37 @@ public:
     class Type;
     class Entry;
 
     class Type;
     class Entry;
 

+    struct ConfigDescription : public ResTable_config {
+        ConfigDescription() {
+            memset(this, 0, sizeof(*this));
+            size = sizeof(ResTable_config);
+        }
+        ConfigDescription(const ResTable_config&o) {
+            *static_cast<ResTable_config*>(this) = o;
+            size = sizeof(ResTable_config);
+        }
+        ConfigDescription(const ConfigDescription&o) {
+            *static_cast<ResTable_config*>(this) = o;
+        }
+
+        ConfigDescription& operator=(const ResTable_config& o) {
+            *static_cast<ResTable_config*>(this) = o;
+            size = sizeof(ResTable_config);
+            return *this;
+        }
+        ConfigDescription& operator=(const ConfigDescription& o) {
+            *static_cast<ResTable_config*>(this) = o;
+            return *this;
+        }
+
+        inline bool operator<(const ConfigDescription& o) const { return compare(o) < 0; }
+        inline bool operator<=(const ConfigDescription& o) const { return compare(o) <= 0; }
+        inline bool operator==(const ConfigDescription& o) const { return compare(o) == 0; }
+        inline bool operator!=(const ConfigDescription& o) const { return compare(o) != 0; }
+        inline bool operator>=(const ConfigDescription& o) const { return compare(o) >= 0; }
+        inline bool operator>(const ConfigDescription& o) const { return compare(o) > 0; }
+    };
+

     ResourceTable(Bundle* bundle, const String16& assetsPackage);
 
     status_t addIncludedResources(Bundle* bundle, const sp<AaptAssets>& assets);
     ResourceTable(Bundle* bundle, const String16& assetsPackage);
 
     status_t addIncludedResources(Bundle* bundle, const sp<AaptAssets>& assets);


@@ -96,6 +134,7 @@ public:
                     const String16& name,
                     const String16& bagParent,
                     const ResTable_config* params = NULL,
                     const String16& name,
                     const String16& bagParent,
                     const ResTable_config* params = NULL,

+                    bool overlay = false,

                     bool replace = false,
                     bool isId = false);
     
                     bool replace = false,
                     bool isId = false);
     


@@ -116,6 +155,11 @@ public:
                        const String16& type,
                        const String16& name) const;
 
                        const String16& type,
                        const String16& name) const;
 

+    bool hasBagOrEntry(const String16& package,
+                       const String16& type,
+                       const String16& name,
+                       const ResTable_config& config) const;
+

     bool hasBagOrEntry(const String16& ref,
                        const String16* defType = NULL,
                        const String16* defPackage = NULL);
     bool hasBagOrEntry(const String16& ref,
                        const String16* defType = NULL,
                        const String16* defPackage = NULL);


@@ -131,6 +175,9 @@ public:
                            const String16& name,
                            const String16& comment);
     
                            const String16& name,
                            const String16& comment);
     

+    void canAddEntry(const SourcePos& pos,
+        const String16& package, const String16& type, const String16& name);
+        

     size_t size() const;
     size_t numLocalResources() const;
     bool hasResources() const;
     size_t size() const;
     size_t numLocalResources() const;
     bool hasResources() const;


@@ -151,13 +198,13 @@ public:
     uint32_t getResId(const String16& package,
                       const String16& type,
                       const String16& name,
     uint32_t getResId(const String16& package,
                       const String16& type,
                       const String16& name,

-                      bool onlyPublic = false) const;
+                      bool onlyPublic = true) const;

 
     uint32_t getResId(const String16& ref,
                       const String16* defType = NULL,
                       const String16* defPackage = NULL,
                       const char** outErrorMsg = NULL,
 
     uint32_t getResId(const String16& ref,
                       const String16* defType = NULL,
                       const String16* defPackage = NULL,
                       const char** outErrorMsg = NULL,

-                      bool onlyPublic = false) const;
+                      bool onlyPublic = true) const;

 
     static bool isValidResourceName(const String16& s);
     
 
     static bool isValidResourceName(const String16& s);
     


@@ -167,7 +214,9 @@ public:
                        uint32_t attrID,
                        const Vector<StringPool::entry_style_span>* style = NULL,
                        String16* outStr = NULL, void* accessorCookie = NULL,
                        uint32_t attrID,
                        const Vector<StringPool::entry_style_span>* style = NULL,
                        String16* outStr = NULL, void* accessorCookie = NULL,

-                       uint32_t attrType = ResTable_map::TYPE_ANY);
+                       uint32_t attrType = ResTable_map::TYPE_ANY,
+                       const String8* configTypeName = NULL,
+                       const ConfigDescription* config = NULL);

 
     status_t assignResourceIds();
     status_t addSymbols(const sp<AaptSymbols>& outSymbols = NULL);
 
     status_t assignResourceIds();
     status_t addSymbols(const sp<AaptSymbols>& outSymbols = NULL);


@@ -289,7 +338,10 @@ public:
         status_t assignResourceIds(ResourceTable* table,
                                    const String16& package);
 
         status_t assignResourceIds(ResourceTable* table,
                                    const String16& package);
 

-        status_t prepareFlatten(StringPool* strings, ResourceTable* table);
+        status_t prepareFlatten(StringPool* strings, ResourceTable* table,
+               const String8* configTypeName, const ConfigDescription* config);
+
+        status_t remapStringValue(StringPool* strings);

 
         ssize_t flatten(Bundle*, const sp<AaptFile>& data, bool isPublic);
 
 
         ssize_t flatten(Bundle*, const sp<AaptFile>& data, bool isPublic);
 


@@ -306,37 +358,6 @@ public:
         uint32_t mParentId;
         SourcePos mPos;
     };
         uint32_t mParentId;
         SourcePos mPos;
     };

-
-    struct ConfigDescription : public ResTable_config {
-        ConfigDescription() {
-            memset(this, 0, sizeof(*this));
-            size = sizeof(ResTable_config);
-        }
-        ConfigDescription(const ResTable_config&o) {
-            *static_cast<ResTable_config*>(this) = o;
-            size = sizeof(ResTable_config);
-        }
-        ConfigDescription(const ConfigDescription&o) {
-            *static_cast<ResTable_config*>(this) = o;
-        }
-        
-        ConfigDescription& operator=(const ResTable_config& o) {
-            *static_cast<ResTable_config*>(this) = o;
-            size = sizeof(ResTable_config);
-            return *this;
-        }
-        ConfigDescription& operator=(const ConfigDescription& o) {
-            *static_cast<ResTable_config*>(this) = o;
-            return *this;
-        }
-        
-        inline bool operator<(const ConfigDescription& o) const { return compare(o) < 0; }
-        inline bool operator<=(const ConfigDescription& o) const { return compare(o) <= 0; }
-        inline bool operator==(const ConfigDescription& o) const { return compare(o) == 0; }
-        inline bool operator!=(const ConfigDescription& o) const { return compare(o) != 0; }
-        inline bool operator>=(const ConfigDescription& o) const { return compare(o) >= 0; }
-        inline bool operator>(const ConfigDescription& o) const { return compare(o) > 0; }
-    };

     
     class ConfigList : public RefBase {
     public:
     
     class ConfigList : public RefBase {
     public:


@@ -412,12 +433,16 @@ public:
         status_t addPublic(const SourcePos& pos,
                            const String16& name,
                            const uint32_t ident);
         status_t addPublic(const SourcePos& pos,
                            const String16& name,
                            const uint32_t ident);

-
+                           
+        void canAddEntry(const String16& name);
+        

         String16 getName() const { return mName; }
         sp<Entry> getEntry(const String16& entry,
                            const SourcePos& pos,
                            const ResTable_config* config = NULL,
         String16 getName() const { return mName; }
         sp<Entry> getEntry(const String16& entry,
                            const SourcePos& pos,
                            const ResTable_config* config = NULL,

-                           bool doSetIndex = false);
+                           bool doSetIndex = false,
+                           bool overlay = false,
+                           bool autoAddOverlay = false);

 
         const SourcePos& getFirstPublicSourcePos() const { return *mFirstPublicSourcePos; }
 
 
         const SourcePos& getFirstPublicSourcePos() const { return *mFirstPublicSourcePos; }
 


@@ -433,6 +458,8 @@ public:
         const DefaultKeyedVector<String16, sp<ConfigList> >& getConfigs() const { return mConfigs; }
         const Vector<sp<ConfigList> >& getOrderedConfigs() const { return mOrderedConfigs; }
 
         const DefaultKeyedVector<String16, sp<ConfigList> >& getConfigs() const { return mConfigs; }
         const Vector<sp<ConfigList> >& getOrderedConfigs() const { return mOrderedConfigs; }
 

+        const SortedVector<String16>& getCanAddEntries() const { return mCanAddEntries; }
+        

         const SourcePos& getPos() const { return mPos; }
     private:
         String16 mName;
         const SourcePos& getPos() const { return mPos; }
     private:
         String16 mName;


@@ -441,6 +468,7 @@ public:
         SortedVector<ConfigDescription> mUniqueConfigs;
         DefaultKeyedVector<String16, sp<ConfigList> > mConfigs;
         Vector<sp<ConfigList> > mOrderedConfigs;
         SortedVector<ConfigDescription> mUniqueConfigs;
         DefaultKeyedVector<String16, sp<ConfigList> > mConfigs;
         Vector<sp<ConfigList> > mOrderedConfigs;

+        SortedVector<String16> mCanAddEntries;

         int32_t mPublicIndex;
         int32_t mIndex;
         SourcePos mPos;
         int32_t mPublicIndex;
         int32_t mIndex;
         SourcePos mPos;


@@ -501,6 +529,7 @@ private:
                        const String16& type,
                        const String16& name,
                        const SourcePos& pos,
                        const String16& type,
                        const String16& name,
                        const SourcePos& pos,

+                       bool overlay,

                        const ResTable_config* config = NULL,
                        bool doSetIndex = false);
     sp<const Entry> getEntry(uint32_t resID,
                        const ResTable_config* config = NULL,
                        bool doSetIndex = false);
     sp<const Entry> getEntry(uint32_t resID,


@@ -525,19 +554,4 @@ private:
     map<String16, set<String8> > mLocalizations;
 };
 
     map<String16, set<String8> > mLocalizations;
 };
 

-class ResourceFilter
-{
-public:
-    ResourceFilter() : mData(), mContainsPseudo(false) {}
-    status_t parse(const char* arg);
-    bool match(int axis, uint32_t value);
-    bool match(const ResTable_config& config);
-    inline bool containsPseudo() { return mContainsPseudo; }
-
-private:
-    KeyedVector<int,SortedVector<uint32_t> > mData;
-    bool mContainsPseudo;
-};
-
-

 #endif
 #endif