diff options
| author | Eric Chiang <eschiang@google.com> | 2023-05-02 21:24:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-02 21:24:27 +0000 |
| commit | 9a38a0534a7c6a194c1cdc79d2829fcd5ba0e3d5 (patch) | |
| tree | e1ee5af6b49363b47b43d35b90deed296bdf9d0f | |
| parent | 107341a2dd01e0f635a151884a0cd472a76df8b6 (diff) | |
| parent | 42dabb6de55f2ebbdbf4610310a00af7106593c1 (diff) | |
| download | car-9a38a0534a7c6a194c1cdc79d2829fcd5ba0e3d5.tar.gz | |
Merge "Update OccupantZone config to match magpie" into udc-dev am: 42dabb6de5
Original change: https://googleplex-android-review.googlesource.com/c/device/generic/car/+/22871516
Change-Id: I755dfe855a421b7cc84aac2ae4ddba5a880f7d34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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, 2 insertions, 20 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 d88c016..4e4b203 100644 --- a/emulator/cluster/rro_overlays/CarServiceOverlay_MdOsDouble/res/values/config.xml +++ b/emulator/cluster/rro_overlays/CarServiceOverlay_MdOsDouble/res/values/config.xml @@ -40,9 +40,8 @@ --> <string-array translatable="false" name="config_occupant_zones"> <item>occupantZoneId=0,occupantType=DRIVER,seatRow=1,seatSide=driver</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> + <item>occupantZoneId=1,occupantType=REAR_PASSENGER,seatRow=2,seatSide=left</item> + <item>occupantZoneId=2,occupantType=REAR_PASSENGER,seatRow=2,seatSide=right</item> </string-array> <!-- @@ -66,10 +65,8 @@ --> <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 018c3fe..be9ec94 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,21 +63,6 @@ </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 --> |