diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-21 19:03:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-21 19:03:53 -0700 |
| commit | a8339dfec9d1b2c6d6fd2f8268f8075d184f64c0 (patch) | |
| tree | 40345158a2aa1084b21de121e5eb8b0d8f8f36a3 /tools/aapt/AaptAssets.h | |
| parent | 9822d2b27330793ea4ba9c3316ef35f402f35fb4 (diff) | |
| parent | 9fc20b0e381b5fe00b7049ef357c839cd05a33bf (diff) | |
| download | frameworks_base-a8339dfec9d1b2c6d6fd2f8268f8075d184f64c0.zip frameworks_base-a8339dfec9d1b2c6d6fd2f8268f8075d184f64c0.tar.gz frameworks_base-a8339dfec9d1b2c6d6fd2f8268f8075d184f64c0.tar.bz2 | |
am 9fc20b0e: Merge change 8126 into donut
Merge commit '9fc20b0e381b5fe00b7049ef357c839cd05a33bf'
* commit '9fc20b0e381b5fe00b7049ef357c839cd05a33bf':
First pass at reworking screen density/size APIs.
Diffstat (limited to 'tools/aapt/AaptAssets.h')
| -rw-r--r-- | tools/aapt/AaptAssets.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/aapt/AaptAssets.h b/tools/aapt/AaptAssets.h index e8c7395..5724349 100644 --- a/tools/aapt/AaptAssets.h +++ b/tools/aapt/AaptAssets.h @@ -30,6 +30,8 @@ enum { AXIS_MNC, AXIS_LANGUAGE, AXIS_REGION, + AXIS_SCREENLAYOUTSIZE, + AXIS_SCREENLAYOUTLONG, AXIS_ORIENTATION, AXIS_DENSITY, AXIS_TOUCHSCREEN, @@ -37,7 +39,6 @@ enum { AXIS_KEYBOARD, AXIS_NAVIGATION, AXIS_SCREENSIZE, - AXIS_SCREENLAYOUT, AXIS_VERSION }; @@ -56,6 +57,8 @@ public: String8 mnc; String8 locale; String8 vendor; + String8 screenLayoutSize; + String8 screenLayoutLong; String8 orientation; String8 density; String8 touchscreen; @@ -63,7 +66,6 @@ public: String8 keyboard; String8 navigation; String8 screenSize; - String8 screenLayout; 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 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); @@ -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 getScreenLayoutName(const char* name, ResTable_config* out = NULL); static bool getVersionName(const char* name, ResTable_config* out = NULL); int compare(const AaptGroupEntry& o) const; |