merge from open-source master

[android/aapt.git] / AaptAssets.h

diff --git a/AaptAssets.h b/AaptAssets.h
index e8c739558a6bdafae088090b6732c3a31e3770e1..865efd1eff8b6228ecb26eed7c2117dfef17a0eb 100644 (file)
--- a/AaptAssets.h
+++ b/AaptAssets.h
@@ -30,6 +30,8 @@ enum {
     AXIS_MNC,
     AXIS_LANGUAGE,
     AXIS_REGION,
     AXIS_MNC,
     AXIS_LANGUAGE,
     AXIS_REGION,

+    AXIS_SCREENLAYOUTSIZE,
+    AXIS_SCREENLAYOUTLONG,

     AXIS_ORIENTATION,
     AXIS_DENSITY,
     AXIS_TOUCHSCREEN,
     AXIS_ORIENTATION,
     AXIS_DENSITY,
     AXIS_TOUCHSCREEN,


@@ -37,7 +39,6 @@ enum {
     AXIS_KEYBOARD,
     AXIS_NAVIGATION,
     AXIS_SCREENSIZE,
     AXIS_KEYBOARD,
     AXIS_NAVIGATION,
     AXIS_SCREENSIZE,

-    AXIS_SCREENLAYOUT,

     AXIS_VERSION
 };
 
     AXIS_VERSION
 };
 


@@ -56,6 +57,8 @@ public:
     String8 mnc;
     String8 locale;
     String8 vendor;
     String8 mnc;
     String8 locale;
     String8 vendor;

+    String8 screenLayoutSize;
+    String8 screenLayoutLong;

     String8 orientation;
     String8 density;
     String8 touchscreen;
     String8 orientation;
     String8 density;
     String8 touchscreen;


@@ -63,7 +66,6 @@ public:
     String8 keyboard;
     String8 navigation;
     String8 screenSize;
     String8 keyboard;
     String8 navigation;
     String8 screenSize;

-    String8 screenLayout;

     String8 version;
 
     bool initFromDirName(const char* dir, String8* resType);
     String8 version;
 
     bool initFromDirName(const char* dir, String8* resType);


@@ -73,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 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 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);


@@ -80,7 +84,6 @@ public:
     static bool getKeyboardName(const char* name, ResTable_config* out = NULL);
     static bool getNavigationName(const char* name, ResTable_config* out = NULL);
     static bool getScreenSizeName(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 getScreenSizeName(const char* name, ResTable_config* out = NULL);

-    static bool getScreenLayoutName(const char* name, ResTable_config* out = NULL);

     static bool getVersionName(const char* name, ResTable_config* out = NULL);
 
     int compare(const AaptGroupEntry& o) const;
     static bool getVersionName(const char* name, ResTable_config* out = NULL);
 
     int compare(const AaptGroupEntry& o) const;


@@ -479,6 +482,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,


@@ -503,6 +508,7 @@ 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 sp<AaptAssets> getOverlay() { return mOverlay; }
     inline void setOverlay(sp<AaptAssets>& overlay) { mOverlay = overlay; }