Adjust the display size per UX

- Set all dpis to 160.
- Driver display for gcar_emu_x86_64 and Passenger displays for gcar_md_emu:
  1408x792 (16:9)
- Driver display for gcar_md_emu: 1848x792 (21:9)
- Increase the memory of gcar_emu_x86_64 to 4GB.
- Sync to vendor/auto/embedded: common/car_md.mk, car_audio_configuration.xml,
  overlay/frameworks/base/core/res/res/values/config.xml.

Bug: 275075670
Test: manually
Change-Id: I7ad2caed67686c5dc75c5bc016ff5ff6ad09c276

3 files changed, 13 insertions, 8 deletions

diff --git a/emulator/multi-display/car_audio_configuration.xml b/emulator/multi-display/car_audio_configuration.xml
index 3843d01..7109d3e 100644
--- a/emulator/multi-display/car_audio_configuration.xml
+++ b/emulator/multi-display/car_audio_configuration.xml
@@ -22,10 +22,13 @@
   in the car environment.
 -->
 <carAudioConfiguration version="3">
+    <mirroringDevices>
+        <mirroringDevice address="bus1000_mirror_device"/>
+    </mirroringDevices>
     <zones>
         <zone name="primary zone" isPrimary="true" occupantZoneId="0">
             <zoneConfigs>
-                <zoneConfig name="primary zone config 0" isDefault="true">
+                <zoneConfig name="primary zone config" isDefault="true">
                     <volumeGroups>
                         <group>
                             <device address="bus0_media_out">
@@ -73,7 +76,7 @@
         </zone>
         <zone name="front passenger zone 1" audioZoneId="1" occupantZoneId="1">
             <zoneConfigs>
-                <zoneConfig name="rear seat zone 1 config 0" isDefault="true">
+                <zoneConfig name="front passenger zone 1 config 0" isDefault="true">
                     <volumeGroups>
                         <group>
                             <device address="bus100_audio_zone_1">
@@ -97,7 +100,7 @@
                         </group>
                     </volumeGroups>
                 </zoneConfig>
-                <zoneConfig name="rear seat zone 1 config 1">
+                <zoneConfig name="front passenger zone 1 config 1">
                     <volumeGroups>
                         <group>
                             <device address="bus110_audio_zone_1">
@@ -126,7 +129,7 @@
                 <inputDevice address="input_bus_tone_zone_1"/>
             </inputDevices>
         </zone>
-        <zone name="rear seat zone 2"  audioZoneId="2" occupantZoneId="2">
+        <zone name="rear seat zone 2"  audioZoneId="2"  occupantZoneId="2">
             <zoneConfigs>
                 <zoneConfig name="rear seat zone 2 config 0" isDefault="true">
                     <volumeGroups>
diff --git a/emulator/multi-display/display_settings.xml b/emulator/multi-display/display_settings.xml
index ad23b79..8f63b42 100644
--- a/emulator/multi-display/display_settings.xml
+++ b/emulator/multi-display/display_settings.xml
@@ -5,19 +5,19 @@
 
 <!-- Display settings for cluster -->
 <display name="port:1"
-    forcedDensity="120"
+    forcedDensity="160"
     dontMoveToTop="true"/>
 
 <!-- Display settings for 2nd Home -->
 <display name="port:2"
     shouldShowSystemDecors="true"
     shouldShowIme="true"
-    forcedDensity="120" />
+    forcedDensity="160" />
 
 <!-- Display settings for 3rd Home -->
 <display name="port:3"
     shouldShowSystemDecors="true"
     shouldShowIme="true"
-    forcedDensity="120" />
+    forcedDensity="160" />
 
 </display-settings>
diff --git a/emulator/multi-display/overlay/frameworks/base/core/res/res/values/config.xml b/emulator/multi-display/overlay/frameworks/base/core/res/res/values/config.xml
index caa7a0b..e9a7179 100644
--- a/emulator/multi-display/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/emulator/multi-display/overlay/frameworks/base/core/res/res/values/config.xml
@@ -23,7 +23,7 @@
     <bool name="config_perDisplayFocusEnabled">true</bool>
 
     <!--  Maximum number of supported users -->
-    <integer name="config_multiuserMaximumUsers">5</integer>
+    <integer name="config_multiuserMaximumUsers">10</integer>
 
     <!-- Maximum number of users we allow to be running at a time -->
     <integer name="config_multiuserMaxRunningUsers">5</integer>
@@ -62,5 +62,7 @@
 
     <!-- Enable multi-user IME sessions -->
     <string translatable="false" name="config_deviceSpecificInputMethodManagerService">com.android.server.inputmethod.InputMethodManagerServiceProxy$Lifecycle</string>
+    <!-- Disable hidding the NavBars (CarSystemBars), as a workaround for b/259604616 -->
+    <bool name="config_hideNavBarForKeyboard">false</bool>
 
 </resources>