vboot: Show BadUSB image in the center
When the device doesn't support SD card recovery, BadSD.bmp is created as
an empty image. When Depthcharge renders a screen, it shows BadSD.bmp and
BadUSB.bmp side by side, resulting in USB stick image shifted to the right.
This change fixes the issue by creating BadDevices.bmp, which can be either
BadDevices.png or BadUSB.png, depending on the board configuration. This is
consistent with how we create InsertDevices.bmp.
BUG=chromium:501060
BRANCH=tot
TEST=Tested on Jerry in 50 languages with and without SD card support
Change-Id: I6e82be0ffe5119607355610f8d3184515dcd11b6
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/337599
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
diff --git a/images/assets/BadDevices.png b/images/assets/BadDevices.png
new file mode 100644
index 0000000..ab2e347
--- /dev/null
+++ b/images/assets/BadDevices.png
Binary files differ
diff --git a/images/assets2x/BadDevices.png b/images/assets2x/BadDevices.png
new file mode 100644
index 0000000..af8d8b0
--- /dev/null
+++ b/images/assets2x/BadDevices.png
Binary files differ
diff --git a/images/build_images.py b/images/build_images.py
index 405e17a..c4fcddc 100755
--- a/images/build_images.py
+++ b/images/build_images.py
@@ -174,7 +174,7 @@
replace_map = {}
if not sdcard:
- replace_map['BadSD'] = DUMMY_IMAGE
+ replace_map['BadDevices'] = 'BadUSB'
replace_map['InsertDevices'] = 'InsertUSB'
replace_map['insert'] = ('insert_usb2' if bad_usb3 else 'insert_usb')
elif bad_usb3:
diff --git a/images/make_default_yaml.py b/images/make_default_yaml.py
index 79d6fe2..8f64a01 100755
--- a/images/make_default_yaml.py
+++ b/images/make_default_yaml.py
@@ -361,7 +361,7 @@
s = Screen('yuck', locale, image_database)
s.add_header()
s.set_centered_y_percent(50)
- s.insert_centered_image_groups(["@yuck"], ["BadSD", "BadUSB"])
+ s.insert_centered_vertical("BadDevices", "@yuck")
s.add_footer(do_url=True)
return s
