cros_config_proto_converter: Set side instead of edge for volume button.
Chrome expects region and side for the volume button config rather than
region and edge.
BUG=b:185885172, b:185885173, b:185884686
TEST=./run_py_unittests.sh
Change-Id: I8423a71fc767844b99e658a2cb16dedd3ff52890
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/config/+/2840064
Auto-Submit: Sam McNally <sammc@chromium.org>
Commit-Queue: Victor Ding <victording@chromium.org>
Reviewed-by: Victor Ding <victording@chromium.org>
diff --git a/payload_utils/cros_config_proto_converter.py b/payload_utils/cros_config_proto_converter.py
index 43b3479..02f5a0d 100755
--- a/payload_utils/cros_config_proto_converter.py
+++ b/payload_utils/cros_config_proto_converter.py
@@ -181,7 +181,7 @@
'region':
topology_pb2.HardwareFeatures.Button.Region.Name(
volume_button.region).lower(),
- 'edge':
+ 'side':
topology_pb2.HardwareFeatures.Button.Edge.Name(volume_button.edge
).lower(),
})
diff --git a/payload_utils/test_data/fake_project.json b/payload_utils/test_data/fake_project.json
index b34596d..65e87e2 100644
--- a/payload_utils/test_data/fake_project.json
+++ b/payload_utils/test_data/fake_project.json
@@ -114,7 +114,7 @@
"extra-ash-flags": [
"--arc-build-properties={'device': 'fake_program_cheets', 'firstApiLevel': '28'}",
"--ash-power-button-position={\"edge\": \"left\", \"position\": 0.9}",
- "--ash-side-volume-button-position={\"region\": \"screen\", \"edge\": \"right\"}",
+ "--ash-side-volume-button-position={\"region\": \"screen\", \"side\": \"right\"}",
"--child-wallpaper-large=/usr/share/chromeos-assets/wallpaper/child_large.jpg",
"--child-wallpaper-small=/usr/share/chromeos-assets/wallpaper/child_small.jpg",
"--default-wallpaper-is-oem",
@@ -262,7 +262,7 @@
"extra-ash-flags": [
"--arc-build-properties={'device': 'fake_program_cheets', 'firstApiLevel': '28'}",
"--ash-power-button-position={\"edge\": \"left\", \"position\": 0.9}",
- "--ash-side-volume-button-position={\"region\": \"screen\", \"edge\": \"right\"}",
+ "--ash-side-volume-button-position={\"region\": \"screen\", \"side\": \"right\"}",
"--child-wallpaper-large=/usr/share/chromeos-assets/wallpaper/child_large.jpg",
"--child-wallpaper-small=/usr/share/chromeos-assets/wallpaper/child_small.jpg",
"--default-wallpaper-is-oem",
@@ -428,7 +428,7 @@
"extra-ash-flags": [
"--arc-build-properties={'device': 'fake_program_cheets', 'firstApiLevel': '28'}",
"--ash-power-button-position={\"edge\": \"left\", \"position\": 0.9}",
- "--ash-side-volume-button-position={\"region\": \"screen\", \"edge\": \"right\"}",
+ "--ash-side-volume-button-position={\"region\": \"screen\", \"side\": \"right\"}",
"--child-wallpaper-large=/usr/share/chromeos-assets/wallpaper/child_large.jpg",
"--child-wallpaper-small=/usr/share/chromeos-assets/wallpaper/child_small.jpg",
"--default-wallpaper-large=/usr/share/chromeos-assets/wallpaper/default_large.jpg",
@@ -553,7 +553,7 @@
"extra-ash-flags": [
"--arc-build-properties={'device': 'fake_program_cheets', 'firstApiLevel': '28'}",
"--ash-power-button-position={\"edge\": \"left\", \"position\": 0.9}",
- "--ash-side-volume-button-position={\"region\": \"screen\", \"edge\": \"right\"}",
+ "--ash-side-volume-button-position={\"region\": \"screen\", \"side\": \"right\"}",
"--child-wallpaper-large=/usr/share/chromeos-assets/wallpaper/child_large.jpg",
"--child-wallpaper-small=/usr/share/chromeos-assets/wallpaper/child_small.jpg",
"--default-wallpaper-large=/usr/share/chromeos-assets/wallpaper/default_large.jpg",
@@ -669,7 +669,7 @@
"extra-ash-flags": [
"--arc-build-properties={'device': 'fake_program_cheets', 'firstApiLevel': '28'}",
"--ash-power-button-position={\"edge\": \"left\", \"position\": 0.9}",
- "--ash-side-volume-button-position={\"region\": \"screen\", \"edge\": \"right\"}",
+ "--ash-side-volume-button-position={\"region\": \"screen\", \"side\": \"right\"}",
"--child-wallpaper-large=/usr/share/chromeos-assets/wallpaper/child_large.jpg",
"--child-wallpaper-small=/usr/share/chromeos-assets/wallpaper/child_small.jpg",
"--default-wallpaper-large=/usr/share/chromeos-assets/wallpaper/default_large.jpg",
@@ -789,7 +789,7 @@
"extra-ash-flags": [
"--arc-build-properties={'device': 'fake_program_cheets', 'firstApiLevel': '28'}",
"--ash-power-button-position={\"edge\": \"left\", \"position\": 0.9}",
- "--ash-side-volume-button-position={\"region\": \"screen\", \"edge\": \"right\"}",
+ "--ash-side-volume-button-position={\"region\": \"screen\", \"side\": \"right\"}",
"--child-wallpaper-large=/usr/share/chromeos-assets/wallpaper/child_large.jpg",
"--child-wallpaper-small=/usr/share/chromeos-assets/wallpaper/child_small.jpg",
"--default-wallpaper-large=/usr/share/chromeos-assets/wallpaper/default_large.jpg",
@@ -910,7 +910,7 @@
"extra-ash-flags": [
"--arc-build-properties={'device': 'fake_program_cheets', 'firstApiLevel': '28'}",
"--ash-power-button-position={\"edge\": \"left\", \"position\": 0.9}",
- "--ash-side-volume-button-position={\"region\": \"screen\", \"edge\": \"right\"}",
+ "--ash-side-volume-button-position={\"region\": \"screen\", \"side\": \"right\"}",
"--child-wallpaper-large=/usr/share/chromeos-assets/wallpaper/child_large.jpg",
"--child-wallpaper-small=/usr/share/chromeos-assets/wallpaper/child_small.jpg",
"--default-wallpaper-large=/usr/share/chromeos-assets/wallpaper/default_large.jpg",
@@ -1031,7 +1031,7 @@
"extra-ash-flags": [
"--arc-build-properties={'device': 'fake_program_cheets', 'firstApiLevel': '28'}",
"--ash-power-button-position={\"edge\": \"left\", \"position\": 0.9}",
- "--ash-side-volume-button-position={\"region\": \"screen\", \"edge\": \"right\"}",
+ "--ash-side-volume-button-position={\"region\": \"screen\", \"side\": \"right\"}",
"--child-wallpaper-large=/usr/share/chromeos-assets/wallpaper/child_large.jpg",
"--child-wallpaper-small=/usr/share/chromeos-assets/wallpaper/child_small.jpg",
"--default-wallpaper-large=/usr/share/chromeos-assets/wallpaper/default_large.jpg",
@@ -1152,7 +1152,7 @@
"extra-ash-flags": [
"--arc-build-properties={'device': 'fake_program_cheets', 'firstApiLevel': '28'}",
"--ash-power-button-position={\"edge\": \"left\", \"position\": 0.9}",
- "--ash-side-volume-button-position={\"region\": \"screen\", \"edge\": \"right\"}",
+ "--ash-side-volume-button-position={\"region\": \"screen\", \"side\": \"right\"}",
"--child-wallpaper-large=/usr/share/chromeos-assets/wallpaper/child_large.jpg",
"--child-wallpaper-small=/usr/share/chromeos-assets/wallpaper/child_small.jpg",
"--default-wallpaper-large=/usr/share/chromeos-assets/wallpaper/default_large.jpg",
@@ -1249,7 +1249,7 @@
"extra-ash-flags": [
"--arc-build-properties={'device': 'fake_program_cheets', 'firstApiLevel': '28'}",
"--ash-power-button-position={\"edge\": \"left\", \"position\": 0.9}",
- "--ash-side-volume-button-position={\"region\": \"screen\", \"edge\": \"right\"}",
+ "--ash-side-volume-button-position={\"region\": \"screen\", \"side\": \"right\"}",
"--child-wallpaper-large=/usr/share/chromeos-assets/wallpaper/child_large.jpg",
"--child-wallpaper-small=/usr/share/chromeos-assets/wallpaper/child_small.jpg",
"--default-wallpaper-large=/usr/share/chromeos-assets/wallpaper/default_large.jpg",
diff --git a/test/project/fake/fake/sw_build_config/platform/chromeos-config/generated/project-config.json b/test/project/fake/fake/sw_build_config/platform/chromeos-config/generated/project-config.json
index ee5fe27..fbcaf94 100644
--- a/test/project/fake/fake/sw_build_config/platform/chromeos-config/generated/project-config.json
+++ b/test/project/fake/fake/sw_build_config/platform/chromeos-config/generated/project-config.json
@@ -147,7 +147,7 @@
"extra-ash-flags": [
"--arc-build-properties={'device': 'fake_program_cheets', 'firstApiLevel': '28'}",
"--ash-power-button-position={\"edge\": \"left\", \"position\": 0.9}",
- "--ash-side-volume-button-position={\"region\": \"screen\", \"edge\": \"right\"}",
+ "--ash-side-volume-button-position={\"region\": \"screen\", \"side\": \"right\"}",
"--child-wallpaper-large=/usr/share/chromeos-assets/wallpaper/child_large.jpg",
"--child-wallpaper-small=/usr/share/chromeos-assets/wallpaper/child_small.jpg",
"--default-wallpaper-is-oem",
@@ -328,7 +328,7 @@
"extra-ash-flags": [
"--arc-build-properties={'device': 'fake_program_cheets', 'firstApiLevel': '28'}",
"--ash-power-button-position={\"edge\": \"left\", \"position\": 0.9}",
- "--ash-side-volume-button-position={\"region\": \"screen\", \"edge\": \"right\"}",
+ "--ash-side-volume-button-position={\"region\": \"screen\", \"side\": \"right\"}",
"--child-wallpaper-large=/usr/share/chromeos-assets/wallpaper/child_large.jpg",
"--child-wallpaper-small=/usr/share/chromeos-assets/wallpaper/child_small.jpg",
"--default-wallpaper-is-oem",
@@ -527,7 +527,7 @@
"extra-ash-flags": [
"--arc-build-properties={'device': 'fake_program_cheets', 'firstApiLevel': '28'}",
"--ash-power-button-position={\"edge\": \"left\", \"position\": 0.9}",
- "--ash-side-volume-button-position={\"region\": \"screen\", \"edge\": \"right\"}",
+ "--ash-side-volume-button-position={\"region\": \"screen\", \"side\": \"right\"}",
"--child-wallpaper-large=/usr/share/chromeos-assets/wallpaper/child_large.jpg",
"--child-wallpaper-small=/usr/share/chromeos-assets/wallpaper/child_small.jpg",
"--default-wallpaper-large=/usr/share/chromeos-assets/wallpaper/default_large.jpg",
@@ -691,7 +691,7 @@
"extra-ash-flags": [
"--arc-build-properties={'device': 'fake_program_cheets', 'firstApiLevel': '28'}",
"--ash-power-button-position={\"edge\": \"left\", \"position\": 0.9}",
- "--ash-side-volume-button-position={\"region\": \"screen\", \"edge\": \"right\"}",
+ "--ash-side-volume-button-position={\"region\": \"screen\", \"side\": \"right\"}",
"--child-wallpaper-large=/usr/share/chromeos-assets/wallpaper/child_large.jpg",
"--child-wallpaper-small=/usr/share/chromeos-assets/wallpaper/child_small.jpg",
"--default-wallpaper-large=/usr/share/chromeos-assets/wallpaper/default_large.jpg",
@@ -840,7 +840,7 @@
"extra-ash-flags": [
"--arc-build-properties={'device': 'fake_program_cheets', 'firstApiLevel': '28'}",
"--ash-power-button-position={\"edge\": \"left\", \"position\": 0.9}",
- "--ash-side-volume-button-position={\"region\": \"screen\", \"edge\": \"right\"}",
+ "--ash-side-volume-button-position={\"region\": \"screen\", \"side\": \"right\"}",
"--child-wallpaper-large=/usr/share/chromeos-assets/wallpaper/child_large.jpg",
"--child-wallpaper-small=/usr/share/chromeos-assets/wallpaper/child_small.jpg",
"--default-wallpaper-large=/usr/share/chromeos-assets/wallpaper/default_large.jpg",
@@ -993,7 +993,7 @@
"extra-ash-flags": [
"--arc-build-properties={'device': 'fake_program_cheets', 'firstApiLevel': '28'}",
"--ash-power-button-position={\"edge\": \"left\", \"position\": 0.9}",
- "--ash-side-volume-button-position={\"region\": \"screen\", \"edge\": \"right\"}",
+ "--ash-side-volume-button-position={\"region\": \"screen\", \"side\": \"right\"}",
"--child-wallpaper-large=/usr/share/chromeos-assets/wallpaper/child_large.jpg",
"--child-wallpaper-small=/usr/share/chromeos-assets/wallpaper/child_small.jpg",
"--default-wallpaper-large=/usr/share/chromeos-assets/wallpaper/default_large.jpg",
@@ -1147,7 +1147,7 @@
"extra-ash-flags": [
"--arc-build-properties={'device': 'fake_program_cheets', 'firstApiLevel': '28'}",
"--ash-power-button-position={\"edge\": \"left\", \"position\": 0.9}",
- "--ash-side-volume-button-position={\"region\": \"screen\", \"edge\": \"right\"}",
+ "--ash-side-volume-button-position={\"region\": \"screen\", \"side\": \"right\"}",
"--child-wallpaper-large=/usr/share/chromeos-assets/wallpaper/child_large.jpg",
"--child-wallpaper-small=/usr/share/chromeos-assets/wallpaper/child_small.jpg",
"--default-wallpaper-large=/usr/share/chromeos-assets/wallpaper/default_large.jpg",
@@ -1301,7 +1301,7 @@
"extra-ash-flags": [
"--arc-build-properties={'device': 'fake_program_cheets', 'firstApiLevel': '28'}",
"--ash-power-button-position={\"edge\": \"left\", \"position\": 0.9}",
- "--ash-side-volume-button-position={\"region\": \"screen\", \"edge\": \"right\"}",
+ "--ash-side-volume-button-position={\"region\": \"screen\", \"side\": \"right\"}",
"--child-wallpaper-large=/usr/share/chromeos-assets/wallpaper/child_large.jpg",
"--child-wallpaper-small=/usr/share/chromeos-assets/wallpaper/child_small.jpg",
"--default-wallpaper-large=/usr/share/chromeos-assets/wallpaper/default_large.jpg",
@@ -1455,7 +1455,7 @@
"extra-ash-flags": [
"--arc-build-properties={'device': 'fake_program_cheets', 'firstApiLevel': '28'}",
"--ash-power-button-position={\"edge\": \"left\", \"position\": 0.9}",
- "--ash-side-volume-button-position={\"region\": \"screen\", \"edge\": \"right\"}",
+ "--ash-side-volume-button-position={\"region\": \"screen\", \"side\": \"right\"}",
"--child-wallpaper-large=/usr/share/chromeos-assets/wallpaper/child_large.jpg",
"--child-wallpaper-small=/usr/share/chromeos-assets/wallpaper/child_small.jpg",
"--default-wallpaper-large=/usr/share/chromeos-assets/wallpaper/default_large.jpg",
@@ -1585,7 +1585,7 @@
"extra-ash-flags": [
"--arc-build-properties={'device': 'fake_program_cheets', 'firstApiLevel': '28'}",
"--ash-power-button-position={\"edge\": \"left\", \"position\": 0.9}",
- "--ash-side-volume-button-position={\"region\": \"screen\", \"edge\": \"right\"}",
+ "--ash-side-volume-button-position={\"region\": \"screen\", \"side\": \"right\"}",
"--child-wallpaper-large=/usr/share/chromeos-assets/wallpaper/child_large.jpg",
"--child-wallpaper-small=/usr/share/chromeos-assets/wallpaper/child_small.jpg",
"--default-wallpaper-large=/usr/share/chromeos-assets/wallpaper/default_large.jpg",
