resolved conflicts for merge of 77fc8b80 to master

[android/aapt.git] / AaptAssets.h

diff --git a/AaptAssets.h b/AaptAssets.h
index 865efd1eff8b6228ecb26eed7c2117dfef17a0eb..65743d80f35b33732d433034b947718808eafe68 100644 (file)
--- a/AaptAssets.h
+++ b/AaptAssets.h
@@ -33,15 +33,31 @@ enum {
     AXIS_SCREENLAYOUTSIZE,
     AXIS_SCREENLAYOUTLONG,
     AXIS_ORIENTATION,
     AXIS_SCREENLAYOUTSIZE,
     AXIS_SCREENLAYOUTLONG,
     AXIS_ORIENTATION,

+    AXIS_UIMODETYPE,
+    AXIS_UIMODENIGHT,

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

+    AXIS_NAVHIDDEN,

     AXIS_NAVIGATION,
     AXIS_SCREENSIZE,
     AXIS_NAVIGATION,
     AXIS_SCREENSIZE,

+    AXIS_SMALLESTSCREENWIDTHDP,
+    AXIS_SCREENWIDTHDP,
+    AXIS_SCREENHEIGHTDP,

     AXIS_VERSION
 };
 
     AXIS_VERSION
 };
 

+enum {
+    SDK_CUPCAKE = 3,
+    SDK_DONUT = 4,
+    SDK_ECLAIR = 5,
+    SDK_ECLAIR_0_1 = 6,
+    SDK_MR1 = 7,
+    SDK_FROYO = 8,
+    SDK_HONEYCOMB_MR2 = 13,
+};
+

 /**
  * This structure contains a specific variation of a single file out
  * of all the variations it can have that we can have.
 /**
  * This structure contains a specific variation of a single file out
  * of all the variations it can have that we can have.


@@ -57,13 +73,19 @@ public:
     String8 mnc;
     String8 locale;
     String8 vendor;
     String8 mnc;
     String8 locale;
     String8 vendor;

+    String8 smallestScreenWidthDp;
+    String8 screenWidthDp;
+    String8 screenHeightDp;

     String8 screenLayoutSize;
     String8 screenLayoutLong;
     String8 orientation;
     String8 screenLayoutSize;
     String8 screenLayoutLong;
     String8 orientation;

+    String8 uiModeType;
+    String8 uiModeNight;

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

+    String8 navHidden;

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


@@ -78,12 +100,18 @@ public:
     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 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 getUiModeTypeName(const char* name, ResTable_config* out = NULL);
+    static bool getUiModeNightName(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 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 getScreenSizeName(const char* name, ResTable_config* out = NULL);

+    static bool getSmallestScreenWidthDpName(const char* name, ResTable_config* out = NULL);
+    static bool getScreenWidthDpName(const char* name, ResTable_config* out = NULL);
+    static bool getScreenHeightDpName(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;