Add -round and -notround qualifier to android runtime/aapt
The round qualifier denotes a device with a screen shape that
is round. The qualifier shows up after the 'long/notlong' qualifier
and before the orientation 'port/land/square' qualifiers.
Change-Id: I3044258b2703a9165694b79725bade770fa6cea1
diff --git a/include/androidfw/ResourceTypes.h b/include/androidfw/ResourceTypes.h
index b15caeb..5130e6c 100644
--- a/include/androidfw/ResourceTypes.h
+++ b/include/androidfw/ResourceTypes.h
@@ -1132,6 +1132,24 @@
// chars. Interpreted in conjunction with the locale field.
char localeVariant[8];
+ enum {
+ // screenLayout2 bits for round/notround.
+ MASK_SCREENROUND = 0x03,
+ SCREENROUND_ANY = ACONFIGURATION_SCREENROUND_ANY,
+ SCREENROUND_NO = ACONFIGURATION_SCREENROUND_NO,
+ SCREENROUND_YES = ACONFIGURATION_SCREENROUND_YES,
+ };
+
+ // An extension of screenConfig.
+ union {
+ struct {
+ uint8_t screenLayout2; // Contains round/notround qualifier.
+ uint8_t screenConfigPad1; // Reserved padding.
+ uint16_t screenConfigPad2; // Reserved padding.
+ };
+ uint32_t screenConfig2;
+ };
+
void copyFromDeviceNoSwap(const ResTable_config& o);
void copyFromDtoH(const ResTable_config& o);
@@ -1160,6 +1178,7 @@
CONFIG_SCREEN_LAYOUT = ACONFIGURATION_SCREEN_LAYOUT,
CONFIG_UI_MODE = ACONFIGURATION_UI_MODE,
CONFIG_LAYOUTDIR = ACONFIGURATION_LAYOUTDIR,
+ CONFIG_SCREEN_ROUND = ACONFIGURATION_SCREEN_ROUND,
};
// Compare two configuration, returning CONFIG_* flags set for each value