Merge "aapt: Remove terminal pointer incrementaion"

[android/aapt.git] / ResourceTable.h

diff --git a/ResourceTable.h b/ResourceTable.h
index bbb81408c8305f9f1271bc609ff3583a4265cc75..8123bb3d4226cc0c85f7417381ba51e69ef9508c 100644 (file)
--- a/ResourceTable.h
+++ b/ResourceTable.h
@@ -124,6 +124,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);


@@ -162,13 +167,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);
     


@@ -544,19 +549,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) const;
-    bool match(const ResTable_config& config) const;
-    inline bool containsPseudo() const { return mContainsPseudo; }
-
-private:
-    KeyedVector<int,SortedVector<uint32_t> > mData;
-    bool mContainsPseudo;
-};
-
-

 #endif
 #endif