Expand support for different screen sizes.

[android/aapt.git] / AaptAssets.h

diff --git a/AaptAssets.h b/AaptAssets.h
index 01c8140b25ce09683d917df04e61ab3efc290fc7..3b96412c7c54a7ed8b33f63c3a9a40f46b7b7540 100644 (file)
--- a/AaptAssets.h
+++ b/AaptAssets.h
@@ -37,6 +37,7 @@ enum {
     AXIS_KEYBOARD,
     AXIS_NAVIGATION,
     AXIS_SCREENSIZE,
     AXIS_KEYBOARD,
     AXIS_NAVIGATION,
     AXIS_SCREENSIZE,

+    AXIS_SCREENLAYOUT,

     AXIS_VERSION
 };
 
     AXIS_VERSION
 };
 


@@ -62,6 +63,7 @@ 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);


@@ -78,6 +80,7 @@ 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;