[MultiDisplay][Virtio Input] Created 11 .idc Files for Emulator Multi-Touch Virtio Device
BUG: 129491066
Test: Create 10 virtualdisplays, verify the input works
Signed-off-by: Weilun Du <wdu@google.com>
Change-Id: I2af1aec9975ddc3cb83175a2320fa16c2fed9063
Merged-In: I2af1aec9975ddc3cb83175a2320fa16c2fed9063
diff --git a/input/virtio_input_multi_touch_1.idc b/input/virtio_input_multi_touch_1.idc
index f740c04..bc7ff66 100644
--- a/input/virtio_input_multi_touch_1.idc
+++ b/input/virtio_input_multi_touch_1.idc
@@ -1,7 +1,5 @@
device.internal = 1
-
touch.deviceType = touchScreen
touch.orientationAware = 1
-
cursor.mode = navigation
cursor.orientationAware = 1
diff --git a/input/virtio_input_multi_touch_10.idc b/input/virtio_input_multi_touch_10.idc
new file mode 100644
index 0000000..47dbd42
--- /dev/null
+++ b/input/virtio_input_multi_touch_10.idc
@@ -0,0 +1,12 @@
+device.internal = 1
+
+touch.deviceType = touchScreen
+touch.orientationAware = 1
+
+cursor.mode = navigation
+cursor.orientationAware = 1
+
+# This displayID matches the unique ID of the virtual display created for Emulator.
+# This will indicate to input flinger than it should link this input device
+# with the virtual display.
+touch.displayId = virtual:com.android.emulator.multidisplay:1234570
diff --git a/input/virtio_input_multi_touch_11.idc b/input/virtio_input_multi_touch_11.idc
new file mode 100644
index 0000000..a845bec
--- /dev/null
+++ b/input/virtio_input_multi_touch_11.idc
@@ -0,0 +1,12 @@
+device.internal = 1
+
+touch.deviceType = touchScreen
+touch.orientationAware = 1
+
+cursor.mode = navigation
+cursor.orientationAware = 1
+
+# This displayID matches the unique ID of the virtual display created for Emulator.
+# This will indicate to input flinger than it should link this input device
+# with the virtual display.
+touch.displayId = virtual:com.android.emulator.multidisplay:1234571
diff --git a/input/virtio_input_multi_touch_2.idc b/input/virtio_input_multi_touch_2.idc
index baba2dc..7222cab 100644
--- a/input/virtio_input_multi_touch_2.idc
+++ b/input/virtio_input_multi_touch_2.idc
@@ -9,4 +9,4 @@
# This displayID matches the unique ID of the virtual display created for Emulator.
# This will indicate to input flinger than it should link this input device
# with the virtual display.
-touch.displayId = virtual:android:1234567
+touch.displayId = virtual:com.android.emulator.multidisplay:1234562
diff --git a/input/virtio_input_multi_touch_3.idc b/input/virtio_input_multi_touch_3.idc
new file mode 100644
index 0000000..9750e95
--- /dev/null
+++ b/input/virtio_input_multi_touch_3.idc
@@ -0,0 +1,12 @@
+device.internal = 1
+
+touch.deviceType = touchScreen
+touch.orientationAware = 1
+
+cursor.mode = navigation
+cursor.orientationAware = 1
+
+# This displayID matches the unique ID of the virtual display created for Emulator.
+# This will indicate to input flinger than it should link this input device
+# with the virtual display.
+touch.displayId = virtual:com.android.emulator.multidisplay:1234563
diff --git a/input/virtio_input_multi_touch_4.idc b/input/virtio_input_multi_touch_4.idc
new file mode 100644
index 0000000..8cc357e
--- /dev/null
+++ b/input/virtio_input_multi_touch_4.idc
@@ -0,0 +1,12 @@
+device.internal = 1
+
+touch.deviceType = touchScreen
+touch.orientationAware = 1
+
+cursor.mode = navigation
+cursor.orientationAware = 1
+
+# This displayID matches the unique ID of the virtual display created for Emulator.
+# This will indicate to input flinger than it should link this input device
+# with the virtual display.
+touch.displayId = virtual:com.android.emulator.multidisplay:1234564
diff --git a/input/virtio_input_multi_touch_5.idc b/input/virtio_input_multi_touch_5.idc
new file mode 100644
index 0000000..9ceeb8b
--- /dev/null
+++ b/input/virtio_input_multi_touch_5.idc
@@ -0,0 +1,12 @@
+device.internal = 1
+
+touch.deviceType = touchScreen
+touch.orientationAware = 1
+
+cursor.mode = navigation
+cursor.orientationAware = 1
+
+# This displayID matches the unique ID of the virtual display created for Emulator.
+# This will indicate to input flinger than it should link this input device
+# with the virtual display.
+touch.displayId = virtual:com.android.emulator.multidisplay:1234565
diff --git a/input/virtio_input_multi_touch_6.idc b/input/virtio_input_multi_touch_6.idc
new file mode 100644
index 0000000..f8cfb76
--- /dev/null
+++ b/input/virtio_input_multi_touch_6.idc
@@ -0,0 +1,12 @@
+device.internal = 1
+
+touch.deviceType = touchScreen
+touch.orientationAware = 1
+
+cursor.mode = navigation
+cursor.orientationAware = 1
+
+# This displayID matches the unique ID of the virtual display created for Emulator.
+# This will indicate to input flinger than it should link this input device
+# with the virtual display.
+touch.displayId = virtual:com.android.emulator.multidisplay:1234566
diff --git a/input/virtio_input_multi_touch_7.idc b/input/virtio_input_multi_touch_7.idc
new file mode 100644
index 0000000..7147fb7
--- /dev/null
+++ b/input/virtio_input_multi_touch_7.idc
@@ -0,0 +1,12 @@
+device.internal = 1
+
+touch.deviceType = touchScreen
+touch.orientationAware = 1
+
+cursor.mode = navigation
+cursor.orientationAware = 1
+
+# This displayID matches the unique ID of the virtual display created for Emulator.
+# This will indicate to input flinger than it should link this input device
+# with the virtual display.
+touch.displayId = virtual:com.android.emulator.multidisplay:1234567
diff --git a/input/virtio_input_multi_touch_8.idc b/input/virtio_input_multi_touch_8.idc
new file mode 100644
index 0000000..84ae793
--- /dev/null
+++ b/input/virtio_input_multi_touch_8.idc
@@ -0,0 +1,12 @@
+device.internal = 1
+
+touch.deviceType = touchScreen
+touch.orientationAware = 1
+
+cursor.mode = navigation
+cursor.orientationAware = 1
+
+# This displayID matches the unique ID of the virtual display created for Emulator.
+# This will indicate to input flinger than it should link this input device
+# with the virtual display.
+touch.displayId = virtual:com.android.emulator.multidisplay:1234568
diff --git a/input/virtio_input_multi_touch_9.idc b/input/virtio_input_multi_touch_9.idc
new file mode 100644
index 0000000..4b15116
--- /dev/null
+++ b/input/virtio_input_multi_touch_9.idc
@@ -0,0 +1,12 @@
+device.internal = 1
+
+touch.deviceType = touchScreen
+touch.orientationAware = 1
+
+cursor.mode = navigation
+cursor.orientationAware = 1
+
+# This displayID matches the unique ID of the virtual display created for Emulator.
+# This will indicate to input flinger than it should link this input device
+# with the virtual display.
+touch.displayId = virtual:com.android.emulator.multidisplay:1234569
diff --git a/vendor.mk b/vendor.mk
index 0c78419..c93516f 100644
--- a/vendor.mk
+++ b/vendor.mk
@@ -161,6 +161,15 @@
device/generic/goldfish/input/goldfish_rotary.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/goldfish_rotary.idc \
device/generic/goldfish/input/virtio_input_multi_touch_1.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_1.idc \
device/generic/goldfish/input/virtio_input_multi_touch_2.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_2.idc \
+ device/generic/goldfish/input/virtio_input_multi_touch_3.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_3.idc \
+ device/generic/goldfish/input/virtio_input_multi_touch_4.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_4.idc \
+ device/generic/goldfish/input/virtio_input_multi_touch_5.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_5.idc \
+ device/generic/goldfish/input/virtio_input_multi_touch_6.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_6.idc \
+ device/generic/goldfish/input/virtio_input_multi_touch_7.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_7.idc \
+ device/generic/goldfish/input/virtio_input_multi_touch_8.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_8.idc \
+ device/generic/goldfish/input/virtio_input_multi_touch_9.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_9.idc \
+ device/generic/goldfish/input/virtio_input_multi_touch_10.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_10.idc \
+ device/generic/goldfish/input/virtio_input_multi_touch_11.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_11.idc \
device/generic/goldfish/data/etc/config.ini:config.ini \
device/generic/goldfish/wifi/simulated_hostapd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/simulated_hostapd.conf \
device/generic/goldfish/wifi/wpa_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant.conf \
