merge from donut

[android/aapt.git] / AaptAssets.h

diff --git a/AaptAssets.h b/AaptAssets.h
index 6ab0ae542defdc3f5630d4952c09592854ee2e9d..63afe5ce174e6f80a8f1986c1e57277ffc40de3c 100644 (file)
--- a/AaptAssets.h
+++ b/AaptAssets.h
@@ -30,6 +30,8 @@ enum {
     AXIS_MNC,
     AXIS_LANGUAGE,
     AXIS_REGION,
+    AXIS_SCREENLAYOUTSIZE,
+    AXIS_SCREENLAYOUTLONG,
     AXIS_ORIENTATION,
     AXIS_DENSITY,
     AXIS_TOUCHSCREEN,
@@ -55,6 +57,8 @@ public:
     String8 mnc;
     String8 locale;
     String8 vendor;
+    String8 screenLayoutSize;
+    String8 screenLayoutLong;
     String8 orientation;
     String8 density;
     String8 touchscreen;
@@ -71,6 +75,8 @@ 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 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);
@@ -441,6 +447,8 @@ private:
     AaptSymbolEntry                                 mDefSymbol;
 };
 
+class ResourceTypeSet;
+
 /**
  * Asset hierarchy being operated on.
  */
@@ -491,6 +499,13 @@ public:
 
     inline const Vector<sp<AaptDir> >& resDirs() { return mDirs; }
 
+    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) { mRes = res; }
+
 private:
     String8 mPackage;
     SortedVector<AaptGroupEntry> mGroupEntries;
@@ -501,6 +516,9 @@ private:
 
     bool mHaveIncludedAssets;
     AssetManager mIncludedAssets;
+
+    sp<AaptAssets> mOverlay;
+    KeyedVector<String8, sp<ResourceTypeSet> >* mRes;
 };
 
 #endif // __AAPT_ASSETS_H