reconcile korg/master into goog/master

[android/aapt.git] / AaptAssets.h

diff --git a/AaptAssets.h b/AaptAssets.h
index 3f370696289a9bcf97f6e6fb407fea2ff032438c..57243496f12d8ec3494aea623b5295c9ebdb0f29 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,


@@ -55,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;


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