diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-29 16:37:17 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-29 16:37:17 -0700 |
| commit | f6ff591decdea6299aab1a5b6f95917800571de4 (patch) | |
| tree | dee211f3383b10360a61cb4194a1bcc2cc26bdd4 /tools/aapt/AaptAssets.h | |
| parent | 8c3fc63576c81139a8d16b608550568ad52237c6 (diff) | |
| parent | 72eb0acad5cffc57ce5006f6deab29ee259e461e (diff) | |
| download | frameworks_base-f6ff591decdea6299aab1a5b6f95917800571de4.zip frameworks_base-f6ff591decdea6299aab1a5b6f95917800571de4.tar.gz frameworks_base-f6ff591decdea6299aab1a5b6f95917800571de4.tar.bz2 | |
am 72eb0aca: Merge change 5483 into donut
Merge commit '72eb0acad5cffc57ce5006f6deab29ee259e461e'
* commit '72eb0acad5cffc57ce5006f6deab29ee259e461e':
Expand support for different screen sizes.
Diffstat (limited to 'tools/aapt/AaptAssets.h')
| -rw-r--r-- | tools/aapt/AaptAssets.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/aapt/AaptAssets.h b/tools/aapt/AaptAssets.h index 3f37069..e8c7395 100644 --- a/tools/aapt/AaptAssets.h +++ b/tools/aapt/AaptAssets.h @@ -37,6 +37,7 @@ enum { AXIS_KEYBOARD, AXIS_NAVIGATION, AXIS_SCREENSIZE, + AXIS_SCREENLAYOUT, AXIS_VERSION }; @@ -62,6 +63,7 @@ public: String8 keyboard; String8 navigation; String8 screenSize; + String8 screenLayout; 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 getScreenLayoutName(const char* name, ResTable_config* out = NULL); static bool getVersionName(const char* name, ResTable_config* out = NULL); int compare(const AaptGroupEntry& o) const; |