diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2012-09-04 15:01:03 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-04 15:01:03 -0700 |
| commit | 035ce2ca92742894f7f906c93d7d217c647aa19a (patch) | |
| tree | 091278302dd86f6009db3d86ff95dd607fef8c11 /include | |
| parent | 167611811d4fd6318bc366128590701274488e84 (diff) | |
| parent | 5f7979993979466c79ab4f38d83c6f2aca361662 (diff) | |
| download | frameworks_base-035ce2ca92742894f7f906c93d7d217c647aa19a.zip frameworks_base-035ce2ca92742894f7f906c93d7d217c647aa19a.tar.gz frameworks_base-035ce2ca92742894f7f906c93d7d217c647aa19a.tar.bz2 | |
Merge "Add support for "-rtl" in resources" into jb-mr1-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/androidfw/ResourceTypes.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/androidfw/ResourceTypes.h b/include/androidfw/ResourceTypes.h index 23bca3e..48f5bf3 100644 --- a/include/androidfw/ResourceTypes.h +++ b/include/androidfw/ResourceTypes.h @@ -957,6 +957,13 @@ struct ResTable_config SCREENLONG_ANY = ACONFIGURATION_SCREENLONG_ANY << SHIFT_SCREENLONG, SCREENLONG_NO = ACONFIGURATION_SCREENLONG_NO << SHIFT_SCREENLONG, SCREENLONG_YES = ACONFIGURATION_SCREENLONG_YES << SHIFT_SCREENLONG, + + // screenLayout bits for layout direction. + MASK_LAYOUTDIR = 0xC0, + SHIFT_LAYOUTDIR = 6, + LAYOUTDIR_ANY = ACONFIGURATION_LAYOUTDIR_ANY << SHIFT_LAYOUTDIR, + LAYOUTDIR_LTR = ACONFIGURATION_LAYOUTDIR_LTR << SHIFT_LAYOUTDIR, + LAYOUTDIR_RTL = ACONFIGURATION_LAYOUTDIR_RTL << SHIFT_LAYOUTDIR, }; enum { @@ -1020,7 +1027,8 @@ struct ResTable_config CONFIG_SMALLEST_SCREEN_SIZE = ACONFIGURATION_SMALLEST_SCREEN_SIZE, CONFIG_VERSION = ACONFIGURATION_VERSION, CONFIG_SCREEN_LAYOUT = ACONFIGURATION_SCREEN_LAYOUT, - CONFIG_UI_MODE = ACONFIGURATION_UI_MODE + CONFIG_UI_MODE = ACONFIGURATION_UI_MODE, + CONFIG_LAYOUTDIR = ACONFIGURATION_LAYOUTDIR, }; // Compare two configuration, returning CONFIG_* flags set for each value @@ -1061,7 +1069,7 @@ struct ResTable_config * There should be one of these chunks for each resource type. * * This structure is followed by an array of integers providing the set of - * configuation change flags (ResTable_config::CONFIG_*) that have multiple + * configuration change flags (ResTable_config::CONFIG_*) that have multiple * resources for that configuration. In addition, the high bit is set if that * resource has been made public. */ |