resolved conflicts for merge of 06a8ceac to master

[android/aapt.git] / AaptAssets.h

diff --git a/AaptAssets.h b/AaptAssets.h
index e5afd1bca1c11ca002965e0ab6c0ff3e299b5403..65743d80f35b33732d433034b947718808eafe68 100644 (file)
--- a/AaptAssets.h
+++ b/AaptAssets.h
@@ -42,6 +42,7 @@ enum {
     AXIS_NAVHIDDEN,
     AXIS_NAVIGATION,
     AXIS_SCREENSIZE,
     AXIS_NAVHIDDEN,
     AXIS_NAVIGATION,
     AXIS_SCREENSIZE,

+    AXIS_SMALLESTSCREENWIDTHDP,

     AXIS_SCREENWIDTHDP,
     AXIS_SCREENHEIGHTDP,
     AXIS_VERSION
     AXIS_SCREENWIDTHDP,
     AXIS_SCREENHEIGHTDP,
     AXIS_VERSION


@@ -54,7 +55,7 @@ enum {
     SDK_ECLAIR_0_1 = 6,
     SDK_MR1 = 7,
     SDK_FROYO = 8,
     SDK_ECLAIR_0_1 = 6,
     SDK_MR1 = 7,
     SDK_FROYO = 8,

-    SDK_ICS = 13,
+    SDK_HONEYCOMB_MR2 = 13,

 };
 
 /**
 };
 
 /**


@@ -72,10 +73,11 @@ public:
     String8 mnc;
     String8 locale;
     String8 vendor;
     String8 mnc;
     String8 locale;
     String8 vendor;

-    String8 screenLayoutSize;
-    String8 screenLayoutLong;
+    String8 smallestScreenWidthDp;

     String8 screenWidthDp;
     String8 screenHeightDp;
     String8 screenWidthDp;
     String8 screenHeightDp;

+    String8 screenLayoutSize;
+    String8 screenLayoutLong;

     String8 orientation;
     String8 uiModeType;
     String8 uiModeNight;
     String8 orientation;
     String8 uiModeType;
     String8 uiModeNight;


@@ -107,6 +109,7 @@ public:
     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 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 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);
     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);