summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Jeong <ericjeong@google.com>2022-11-21 11:24:43 -0800
committerEric Jeong <ericjeong@google.com>2023-01-23 22:36:42 -0800
commitd39cce44c21deda796653287b0fbb9e13d00b346 (patch)
tree0e9e39aeaf92b7e01e913ea8477be5cee2d67ddb
parent33ee208f8d32af70e068d42616d365ee7994a416 (diff)
downloadcar-d39cce44c21deda796653287b0fbb9e13d00b346.tar.gz
Allow different display group per displays in sdk_car_md
Bug: 257996451 Test: lunch sdk_car_md_x86_64-userdebug && build && flash && adb shell dumpsys display && make sure each physical display has different display group Change-Id: I5667ac7db77e865d9c351a2425d94bf6a7fc0f6c
-rw-r--r--emulator/multi-display/display_layout_configuration.xml23
-rw-r--r--sdk_car_md_x86_64.mk3
2 files changed, 25 insertions, 1 deletions
diff --git a/emulator/multi-display/display_layout_configuration.xml b/emulator/multi-display/display_layout_configuration.xml
new file mode 100644
index 0000000..8234575
--- /dev/null
+++ b/emulator/multi-display/display_layout_configuration.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<layouts>
+ <layout>
+ <!-- Use the default state -->
+ <state>-1</state>
+
+ <display enabled="true" defaultDisplay="true">
+ <address>4619827259835644672</address>
+ </display>
+
+ <display enabled="true" defaultDisplay="false" displayGroup="passenger_display1">
+ <address>4619827124781842690</address>
+ </display>
+
+ <display enabled="true" defaultDisplay="false" displayGroup="passenger_display2">
+ <address>4619827540095559171</address>
+ </display>
+
+ <display enabled="true" defaultDisplay="false">
+ <address>4619827551948147201</address>
+ </display>
+ </layout>
+</layouts>
diff --git a/sdk_car_md_x86_64.mk b/sdk_car_md_x86_64.mk
index 1d16a4f..103f79b 100644
--- a/sdk_car_md_x86_64.mk
+++ b/sdk_car_md_x86_64.mk
@@ -19,8 +19,9 @@ PRODUCT_COPY_FILES += \
device/generic/car/emulator/multi-display/input/virtio_input_multi_touch_8.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_8.idc \
device/generic/car/emulator/multi-display/input/virtio_input_multi_touch_9.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_9.idc
-# Overrides Goldfish's default display_settings.xml
+# Overrides Goldfish's default display settings
PRODUCT_COPY_FILES += \
+ device/generic/car/emulator/multi-display/display_layout_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/displayconfig/display_layout_configuration.xml \
device/generic/car/emulator/multi-display/display_settings.xml:$(TARGET_COPY_OUT_VENDOR)/etc/display_settings.xml
PRODUCT_COPY_FILES += \