diff options
Diffstat (limited to 'libs/androidfw/include')
| -rw-r--r-- | libs/androidfw/include/androidfw/ResourceTypes.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libs/androidfw/include/androidfw/ResourceTypes.h b/libs/androidfw/include/androidfw/ResourceTypes.h index 1e4aee9d18e7..86ab123ff064 100644 --- a/libs/androidfw/include/androidfw/ResourceTypes.h +++ b/libs/androidfw/include/androidfw/ResourceTypes.h @@ -1147,25 +1147,25 @@ struct ResTable_config }; enum { - // colorimetry bits for wide-color gamut/narrow-color gamut. + // colorMode bits for wide-color gamut/narrow-color gamut. MASK_WIDE_COLOR_GAMUT = 0x03, WIDE_COLOR_GAMUT_ANY = ACONFIGURATION_WIDE_COLOR_GAMUT_ANY, WIDE_COLOR_GAMUT_NO = ACONFIGURATION_WIDE_COLOR_GAMUT_NO, WIDE_COLOR_GAMUT_YES = ACONFIGURATION_WIDE_COLOR_GAMUT_YES, - // colorimetry bits for HDR/LDR. + // colorMode bits for HDR/LDR. MASK_HDR = 0x0c, - SHIFT_COLORIMETRY_HDR = 2, - HDR_ANY = ACONFIGURATION_HDR_ANY << SHIFT_COLORIMETRY_HDR, - HDR_NO = ACONFIGURATION_HDR_NO << SHIFT_COLORIMETRY_HDR, - HDR_YES = ACONFIGURATION_HDR_YES << SHIFT_COLORIMETRY_HDR, + SHIFT_COLOR_MODE_HDR = 2, + HDR_ANY = ACONFIGURATION_HDR_ANY << SHIFT_COLOR_MODE_HDR, + HDR_NO = ACONFIGURATION_HDR_NO << SHIFT_COLOR_MODE_HDR, + HDR_YES = ACONFIGURATION_HDR_YES << SHIFT_COLOR_MODE_HDR, }; // An extension of screenConfig. union { struct { uint8_t screenLayout2; // Contains round/notround qualifier. - uint8_t colorimetry; // Wide-gamut, HDR, etc. + uint8_t colorMode; // Wide-gamut, HDR, etc. uint16_t screenConfigPad2; // Reserved padding. }; uint32_t screenConfig2; @@ -1208,7 +1208,7 @@ struct ResTable_config CONFIG_UI_MODE = ACONFIGURATION_UI_MODE, CONFIG_LAYOUTDIR = ACONFIGURATION_LAYOUTDIR, CONFIG_SCREEN_ROUND = ACONFIGURATION_SCREEN_ROUND, - CONFIG_COLORIMETRY = ACONFIGURATION_COLORIMETRY, + CONFIG_COLOR_MODE = ACONFIGURATION_COLOR_MODE, }; // Compare two configuration, returning CONFIG_* flags set for each value |