diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-13 01:05:54 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-13 01:05:54 +0000 |
| commit | c51f10f1b5a7199156fba14b091eec47f16027c1 (patch) | |
| tree | 5b4454f2d580cd508a0ae813426d1af7c2918985 | |
| parent | c3dd24c1dd703eae8f6ce2088b047912b54c1506 (diff) | |
| parent | 6ab8a3c110b47a493816ea1e85e0125c6a220672 (diff) | |
| download | car-android14-d1-s6-release.tar.gz | |
Snap for 10129066 from 6ab8a3c110b47a493816ea1e85e0125c6a220672 to udc-d1-releaseandroid-14.0.0_r9android-14.0.0_r8android-14.0.0_r7android-14.0.0_r6android-14.0.0_r5android-14.0.0_r4android-14.0.0_r3android-14.0.0_r12android-14.0.0_r11android-14.0.0_r10android14-d1-s7-releaseandroid14-d1-s6-releaseandroid14-d1-s5-releaseandroid14-d1-s4-releaseandroid14-d1-s3-releaseandroid14-d1-s2-releaseandroid14-d1-s1-releaseandroid14-d1-release
Change-Id: I65d29ecd381d7f9334fa916ef87a476ae99cc168
| -rw-r--r-- | emulator/cluster/rro_overlays/CarServiceOverlay_MdOsDouble/res/values/config.xml | 7 | ||||
| -rw-r--r-- | emulator/cluster/rro_overlays/CarServiceOverlay_MdOsDouble/res/xml/car_ux_restrictions_map.xml | 15 |
2 files changed, 20 insertions, 2 deletions
diff --git a/emulator/cluster/rro_overlays/CarServiceOverlay_MdOsDouble/res/values/config.xml b/emulator/cluster/rro_overlays/CarServiceOverlay_MdOsDouble/res/values/config.xml index 4e4b203..d88c016 100644 --- a/emulator/cluster/rro_overlays/CarServiceOverlay_MdOsDouble/res/values/config.xml +++ b/emulator/cluster/rro_overlays/CarServiceOverlay_MdOsDouble/res/values/config.xml @@ -40,8 +40,9 @@ --> <string-array translatable="false" name="config_occupant_zones"> <item>occupantZoneId=0,occupantType=DRIVER,seatRow=1,seatSide=driver</item> - <item>occupantZoneId=1,occupantType=REAR_PASSENGER,seatRow=2,seatSide=left</item> - <item>occupantZoneId=2,occupantType=REAR_PASSENGER,seatRow=2,seatSide=right</item> + <item>occupantZoneId=1,occupantType=FRONT_PASSENGER,seatRow=1,seatSide=oppositeDriver</item> + <item>occupantZoneId=2,occupantType=REAR_PASSENGER,seatRow=2,seatSide=left</item> + <item>occupantZoneId=3,occupantType=REAR_PASSENGER,seatRow=2,seatSide=right</item> </string-array> <!-- @@ -65,8 +66,10 @@ --> <string-array translatable="false" name="config_occupant_display_mapping"> <item>displayPort=0,displayType=MAIN,occupantZoneId=0,inputTypes=TOUCH_SCREEN|DPAD_KEYS|NAVIGATE_KEYS|ROTARY_NAVIGATION</item> + <item>displayUniqueId=virtual:com.android.car.cluster.osdouble:ClusterDisplay,displayType=INSTRUMENT_CLUSTER,occupantZoneId=0,inputTypes=DPAD_KEYS</item> <item>displayPort=2,displayType=MAIN,occupantZoneId=1,inputTypes=TOUCH_SCREEN</item> <item>displayPort=3,displayType=MAIN,occupantZoneId=2,inputTypes=TOUCH_SCREEN</item> + <item>displayPort=4,displayType=MAIN,occupantZoneId=3,inputTypes=TOUCH_SCREEN</item> </string-array> <!-- diff --git a/emulator/cluster/rro_overlays/CarServiceOverlay_MdOsDouble/res/xml/car_ux_restrictions_map.xml b/emulator/cluster/rro_overlays/CarServiceOverlay_MdOsDouble/res/xml/car_ux_restrictions_map.xml index be9ec94..018c3fe 100644 --- a/emulator/cluster/rro_overlays/CarServiceOverlay_MdOsDouble/res/xml/car_ux_restrictions_map.xml +++ b/emulator/cluster/rro_overlays/CarServiceOverlay_MdOsDouble/res/xml/car_ux_restrictions_map.xml @@ -63,6 +63,21 @@ </RestrictionMapping> + <RestrictionMapping physicalPort="4"> + <DrivingState state="parked"> + <Restrictions requiresDistractionOptimization="false" uxr="baseline"/> + </DrivingState> + + <DrivingState state="idling"> + <Restrictions requiresDistractionOptimization="false" uxr="baseline"/> + </DrivingState> + + <DrivingState state="moving"> + <Restrictions requiresDistractionOptimization="false" uxr="baseline"/> + </DrivingState> + + </RestrictionMapping> + <!-- Configure restriction parameters here--> <RestrictionParameters> <!-- Parameters to express displayed String related restrictions --> |