merge from open-source master

[android/aapt.git] / AaptAssets.h

diff --git a/AaptAssets.h b/AaptAssets.h
index 6ab0ae542defdc3f5630d4952c09592854ee2e9d..26500a34886d4ce89f988b284c605bda44068511 100644 (file)
--- a/AaptAssets.h
+++ b/AaptAssets.h
@@ -15,7 +15,7 @@
 #include <utils/String8.h>
 #include <utils/Vector.h>
 #include <utils/RefBase.h>
 #include <utils/String8.h>
 #include <utils/Vector.h>
 #include <utils/RefBase.h>

-#include <utils/ZipFile.h>
+#include "ZipFile.h"

 
 #include "Bundle.h"
 #include "SourcePos.h"
 
 #include "Bundle.h"
 #include "SourcePos.h"


@@ -30,11 +30,14 @@ enum {
     AXIS_MNC,
     AXIS_LANGUAGE,
     AXIS_REGION,
     AXIS_MNC,
     AXIS_LANGUAGE,
     AXIS_REGION,

+    AXIS_SCREENLAYOUTSIZE,
+    AXIS_SCREENLAYOUTLONG,

     AXIS_ORIENTATION,
     AXIS_DENSITY,
     AXIS_TOUCHSCREEN,
     AXIS_KEYSHIDDEN,
     AXIS_KEYBOARD,
     AXIS_ORIENTATION,
     AXIS_DENSITY,
     AXIS_TOUCHSCREEN,
     AXIS_KEYSHIDDEN,
     AXIS_KEYBOARD,

+    AXIS_NAVHIDDEN,

     AXIS_NAVIGATION,
     AXIS_SCREENSIZE,
     AXIS_VERSION
     AXIS_NAVIGATION,
     AXIS_SCREENSIZE,
     AXIS_VERSION


@@ -55,11 +58,14 @@ public:
     String8 mnc;
     String8 locale;
     String8 vendor;
     String8 mnc;
     String8 locale;
     String8 vendor;

+    String8 screenLayoutSize;
+    String8 screenLayoutLong;

     String8 orientation;
     String8 density;
     String8 touchscreen;
     String8 keysHidden;
     String8 keyboard;
     String8 orientation;
     String8 density;
     String8 touchscreen;
     String8 keysHidden;
     String8 keyboard;

+    String8 navHidden;

     String8 navigation;
     String8 screenSize;
     String8 version;
     String8 navigation;
     String8 screenSize;
     String8 version;


@@ -71,12 +77,15 @@ public:
     static bool getMccName(const char* name, ResTable_config* out = NULL);
     static bool getMncName(const char* name, ResTable_config* out = NULL);
     static bool getLocaleName(const char* name, ResTable_config* out = NULL);
     static bool getMccName(const char* name, ResTable_config* out = NULL);
     static bool getMncName(const char* name, ResTable_config* out = NULL);
     static bool getLocaleName(const char* name, ResTable_config* out = NULL);

+    static bool getScreenLayoutSizeName(const char* name, ResTable_config* out = NULL);
+    static bool getScreenLayoutLongName(const char* name, ResTable_config* out = NULL);

     static bool getOrientationName(const char* name, ResTable_config* out = NULL);
     static bool getDensityName(const char* name, ResTable_config* out = NULL);
     static bool getTouchscreenName(const char* name, ResTable_config* out = NULL);
     static bool getKeysHiddenName(const char* name, ResTable_config* out = NULL);
     static bool getKeyboardName(const char* name, ResTable_config* out = NULL);
     static bool getNavigationName(const char* name, ResTable_config* out = NULL);
     static bool getOrientationName(const char* name, ResTable_config* out = NULL);
     static bool getDensityName(const char* name, ResTable_config* out = NULL);
     static bool getTouchscreenName(const char* name, ResTable_config* out = NULL);
     static bool getKeysHiddenName(const char* name, ResTable_config* out = NULL);
     static bool getKeyboardName(const char* name, ResTable_config* out = NULL);
     static bool getNavigationName(const char* name, ResTable_config* out = NULL);

+    static bool getNavHiddenName(const char* name, ResTable_config* out = NULL);

     static bool getScreenSizeName(const char* name, ResTable_config* out = NULL);
     static bool getVersionName(const char* name, ResTable_config* out = NULL);
 
     static bool getScreenSizeName(const char* name, ResTable_config* out = NULL);
     static bool getVersionName(const char* name, ResTable_config* out = NULL);
 


@@ -125,7 +134,9 @@ public:
         {
             //printf("new AaptFile created %s\n", (const char*)sourceFile);
         }
         {
             //printf("new AaptFile created %s\n", (const char*)sourceFile);
         }

-    virtual ~AaptFile() { }
+    virtual ~AaptFile() {
+        free(mData);
+    }

 
     const String8& getPath() const { return mPath; }
     const AaptGroupEntry& getGroupEntry() const { return mGroupEntry; }
 
     const String8& getPath() const { return mPath; }
     const AaptGroupEntry& getGroupEntry() const { return mGroupEntry; }


@@ -441,14 +452,22 @@ private:
     AaptSymbolEntry                                 mDefSymbol;
 };
 
     AaptSymbolEntry                                 mDefSymbol;
 };
 

+class ResourceTypeSet : public RefBase,
+                        public KeyedVector<String8,sp<AaptGroup> >
+{
+public:
+    ResourceTypeSet();
+};
+
+

 /**
  * Asset hierarchy being operated on.
  */
 class AaptAssets : public AaptDir
 {
 public:
 /**
  * Asset hierarchy being operated on.
  */
 class AaptAssets : public AaptDir
 {
 public:

-    AaptAssets() : AaptDir(String8(), String8()), mHaveIncludedAssets(false) { }
-    virtual ~AaptAssets() { }
+    AaptAssets() : AaptDir(String8(), String8()), mHaveIncludedAssets(false), mRes(NULL) { }
+    virtual ~AaptAssets() { delete mRes; }

 
     const String8& getPackage() const { return mPackage; }
     void setPackage(const String8& package) { mPackage = package; mSymbolsPrivatePackage = package; }
 
     const String8& getPackage() const { return mPackage; }
     void setPackage(const String8& package) { mPackage = package; mSymbolsPrivatePackage = package; }


@@ -466,6 +485,8 @@ public:
                      const sp<AaptFile>& file,
                      const String8& resType);
 
                      const sp<AaptFile>& file,
                      const String8& resType);
 

+    void addGroupEntry(const AaptGroupEntry& entry) { mGroupEntries.add(entry); }
+    

     ssize_t slurpFromArgs(Bundle* bundle);
 
     virtual ssize_t slurpFullTree(Bundle* bundle,
     ssize_t slurpFromArgs(Bundle* bundle);
 
     virtual ssize_t slurpFullTree(Bundle* bundle,


@@ -490,6 +511,14 @@ public:
     void print() const;
 
     inline const Vector<sp<AaptDir> >& resDirs() { return mDirs; }
     void print() const;
 
     inline const Vector<sp<AaptDir> >& resDirs() { return mDirs; }

+    sp<AaptDir> resDir(const String8& name);
+
+    inline sp<AaptAssets> getOverlay() { return mOverlay; }
+    inline void setOverlay(sp<AaptAssets>& overlay) { mOverlay = overlay; }
+    
+    inline KeyedVector<String8, sp<ResourceTypeSet> >* getResources() { return mRes; }
+    inline void 
+        setResources(KeyedVector<String8, sp<ResourceTypeSet> >* res) { delete mRes; mRes = res; }

 
 private:
     String8 mPackage;
 
 private:
     String8 mPackage;


@@ -501,6 +530,9 @@ private:
 
     bool mHaveIncludedAssets;
     AssetManager mIncludedAssets;
 
     bool mHaveIncludedAssets;
     AssetManager mIncludedAssets;

+
+    sp<AaptAssets> mOverlay;
+    KeyedVector<String8, sp<ResourceTypeSet> >* mRes;

 };
 
 #endif // __AAPT_ASSETS_H
 };
 
 #endif // __AAPT_ASSETS_H