newbitmaps: Add TODEV, TONORM, and UPDATE(WAIT) screens.

An initial draft of missing screens, with only English messages (*.txt in
localized folders are now all English - will update them once translation is
ready).

BUG=chrome-os-partner:11078
TEST=make; bitmap_viewer DEFAULT.yaml # see basic screen.

Old-Change-Id: I3209e18bf604030cf8e92d264781add33aab84fe
Reviewed-on: https://gerrit.chromium.org/gerrit/29765
Tested-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Commit-Ready: Hung-Te Lin <hungte@chromium.org>
(cherry picked from commit 1dc00165e5b374edd3be79636657a1d90688a617)

Change-Id: I22888af52d59023421ce552f255eaa01596b46f7
Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/30243

43 files changed, 147 insertions, 6 deletions

diff --git a/scripts/newbitmaps/images/make_default_yaml b/scripts/newbitmaps/images/make_default_yaml
index 88e1cd39..164668e4 100755
--- a/scripts/newbitmaps/images/make_default_yaml
+++ b/scripts/newbitmaps/images/make_default_yaml
@@ -9,7 +9,9 @@ yaml_file="DEFAULT.yaml"
 
 # I'm sorting the locales in more-or-less geographical order. Right should move
 # east, left should move west. Of course we'll start in the US. :-)
-locales="en es_419 pt_BR en_GB fr es pt_PT ca it de el nl da no sv fi et lv lt ru pl cs sk hu sl sr hr bg ro uk tr iw ar fa hi th vi id fil zh_CN zh_TW ko ja"
+locales="en es_419 pt_BR en_GB fr es pt_PT ca it de el nl da no sv fi et lv "\
+"lt ru pl cs sk hu sl sr hr bg ro uk tr iw ar fa hi th vi id fil zh_CN zh_TW "\
+"ko ja"
 localedir="./locale"
 
 # These render right-to-left
@@ -322,10 +324,14 @@ EOF1
   ${lc}_remove_text:      ${localedir}/$lc/remove.bmp
   ${lc}_yuck_text:        ${localedir}/$lc/yuck.bmp
   ${lc}_insert_text:      ${localedir}/$lc/insert.bmp
-  ${lc}_insert_usb_text:  ${localedir}/$lc/insert_usb.bmp
   ${lc}_language_text:    ${localedir}/$lc/language.bmp
   ${lc}_for_help_text:    ${localedir}/$lc/for_help.bmp
 
+  ${lc}_todev_text:    ${localedir}/$lc/todev.bmp
+  ${lc}_tonorm_text:    ${localedir}/$lc/tonorm.bmp
+  ${lc}_back_help_text:    ${localedir}/$lc/back_help.bmp
+  ${lc}_update_text:    ${localedir}/$lc/update.bmp
+
 EOF2
 
     # Also define global variables matching those in the yaml file.
@@ -334,9 +340,12 @@ EOF2
     eval "${lc}_remove_text=${localedir}/$lc/remove.bmp"
     eval "${lc}_yuck_text=${localedir}/$lc/yuck.bmp"
     eval "${lc}_insert_text=${localedir}/$lc/insert.bmp"
-    eval "${lc}_insert_usb_text=${localedir}/$lc/insert_usb.bmp"
     eval "${lc}_language_text=${localedir}/$lc/language.bmp"
     eval "${lc}_for_help_text=${localedir}/$lc/for_help.bmp"
+    eval "${lc}_todev_text=${localedir}/$lc/todev.bmp"
+    eval "${lc}_tonorm_text=${localedir}/$lc/tonorm.bmp"
+    eval "${lc}_back_help_text=${localedir}/$lc/back_help.bmp"
+    eval "${lc}_update_text=${localedir}/$lc/update.bmp"
   done
 
   # List the screens. We need to composite four screens for each locale.
@@ -386,7 +395,39 @@ EOF2
     set_centered_y_percent "white_bg" 40
     add_centered "insert_graphic"
     set_centered_y_percent "white_bg" 50
-    add_centered_below "${lc}_insert_usb_text"
+    add_centered_below "${lc}_insert_text"
+    add_footer_with_url ${lc}
+
+    # ToDeveloper Screen
+    echo "  ${lc}_todev:" >> "$yaml_file"
+    reset_pos
+    add_right_below "white_bg"
+    add_header ${lc}
+    set_centered_y_percent "white_bg" 25
+    add_centered_below "${lc}_todev_text"
+    set_centered_y_percent "white_bg" 50
+    add_centered "${lc}_back_help_text"
+    add_footer_with_url ${lc}
+
+    # ToNormal Screen
+    echo "  ${lc}_tonorm:" >> "$yaml_file"
+    reset_pos
+    add_right_below "white_bg"
+    add_header ${lc}
+    set_centered_y_percent "white_bg" 30
+    add_centered "devmode_graphic"
+    add_centered_below "${lc}_tonorm_text"
+    set_centered_y_percent "white_bg" 70
+    add_centered "${lc}_back_help_text"
+    add_footer_with_url ${lc}
+
+    # Update (WAIT) Screen
+    echo "  ${lc}_update:" >> "$yaml_file"
+    reset_pos
+    add_right_below "white_bg"
+    add_header ${lc}
+    set_centered_y_percent "white_bg" 50
+    add_centered "${lc}_update_text"
     add_footer_with_url ${lc}
 
   done
@@ -405,8 +446,10 @@ EOF2
   guess_locale "$yaml_file"
 
   for lc in $newlocales; do
-    echo "  - [ ${lc}_devel, ${lc}_remove, ${lc}_yuck, ${lc}_insert ]" >> \
-      "$yaml_file"
+    screen_list="${lc}_devel, ${lc}_remove, ${lc}_yuck, ${lc}_insert"
+    # todev/tonorm/update are supported only by newer firmware.
+    screen_list="${screen_list}, ${lc}_todev, ${lc}_tonorm, ${lc}_update"
+    echo "  - [ $screen_list ]" >>"$yaml_file"
   done
 
   cat >>"$yaml_file" <<EOF3
diff --git a/scripts/newbitmaps/strings/localized_text/da/back_help.txt b/scripts/newbitmaps/strings/localized_text/da/back_help.txt
new file mode 100644
index 00000000..2f39438e
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/da/back_help.txt
@@ -0,0 +1 @@
+To go back, press ESC.
diff --git a/scripts/newbitmaps/strings/localized_text/da/todev.txt b/scripts/newbitmaps/strings/localized_text/da/todev.txt
new file mode 100644
index 00000000..072f2348
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/da/todev.txt
@@ -0,0 +1,2 @@
+To turn off OS verification, press ENTER.
+Your system will reboot and local data will be cleared.
diff --git a/scripts/newbitmaps/strings/localized_text/da/tonorm.txt b/scripts/newbitmaps/strings/localized_text/da/tonorm.txt
new file mode 100644
index 00000000..e394be70
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/da/tonorm.txt
@@ -0,0 +1,4 @@
+OS verification is OFF
+
+Press ENTER to confirm you wish to turn OS verification on.
+Your system will reboot and local data will be cleared.
diff --git a/scripts/newbitmaps/strings/localized_text/de/back_help.txt b/scripts/newbitmaps/strings/localized_text/de/back_help.txt
new file mode 100644
index 00000000..2f39438e
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/de/back_help.txt
@@ -0,0 +1 @@
+To go back, press ESC.
diff --git a/scripts/newbitmaps/strings/localized_text/de/todev.txt b/scripts/newbitmaps/strings/localized_text/de/todev.txt
new file mode 100644
index 00000000..072f2348
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/de/todev.txt
@@ -0,0 +1,2 @@
+To turn off OS verification, press ENTER.
+Your system will reboot and local data will be cleared.
diff --git a/scripts/newbitmaps/strings/localized_text/de/tonorm.txt b/scripts/newbitmaps/strings/localized_text/de/tonorm.txt
new file mode 100644
index 00000000..e394be70
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/de/tonorm.txt
@@ -0,0 +1,4 @@
+OS verification is OFF
+
+Press ENTER to confirm you wish to turn OS verification on.
+Your system will reboot and local data will be cleared.
diff --git a/scripts/newbitmaps/strings/localized_text/en/back_help.txt b/scripts/newbitmaps/strings/localized_text/en/back_help.txt
new file mode 100644
index 00000000..2f39438e
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/en/back_help.txt
@@ -0,0 +1 @@
+To go back, press ESC.
diff --git a/scripts/newbitmaps/strings/localized_text/en/todev.txt b/scripts/newbitmaps/strings/localized_text/en/todev.txt
new file mode 100644
index 00000000..072f2348
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/en/todev.txt
@@ -0,0 +1,2 @@
+To turn off OS verification, press ENTER.
+Your system will reboot and local data will be cleared.
diff --git a/scripts/newbitmaps/strings/localized_text/en/tonorm.txt b/scripts/newbitmaps/strings/localized_text/en/tonorm.txt
new file mode 100644
index 00000000..e394be70
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/en/tonorm.txt
@@ -0,0 +1,4 @@
+OS verification is OFF
+
+Press ENTER to confirm you wish to turn OS verification on.
+Your system will reboot and local data will be cleared.
diff --git a/scripts/newbitmaps/strings/localized_text/en_GB/back_help.txt b/scripts/newbitmaps/strings/localized_text/en_GB/back_help.txt
new file mode 100644
index 00000000..2f39438e
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/en_GB/back_help.txt
@@ -0,0 +1 @@
+To go back, press ESC.
diff --git a/scripts/newbitmaps/strings/localized_text/en_GB/todev.txt b/scripts/newbitmaps/strings/localized_text/en_GB/todev.txt
new file mode 100644
index 00000000..072f2348
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/en_GB/todev.txt
@@ -0,0 +1,2 @@
+To turn off OS verification, press ENTER.
+Your system will reboot and local data will be cleared.
diff --git a/scripts/newbitmaps/strings/localized_text/en_GB/tonorm.txt b/scripts/newbitmaps/strings/localized_text/en_GB/tonorm.txt
new file mode 100644
index 00000000..e394be70
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/en_GB/tonorm.txt
@@ -0,0 +1,4 @@
+OS verification is OFF
+
+Press ENTER to confirm you wish to turn OS verification on.
+Your system will reboot and local data will be cleared.
diff --git a/scripts/newbitmaps/strings/localized_text/es/back_help.txt b/scripts/newbitmaps/strings/localized_text/es/back_help.txt
new file mode 100644
index 00000000..2f39438e
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/es/back_help.txt
@@ -0,0 +1 @@
+To go back, press ESC.
diff --git a/scripts/newbitmaps/strings/localized_text/es/todev.txt b/scripts/newbitmaps/strings/localized_text/es/todev.txt
new file mode 100644
index 00000000..072f2348
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/es/todev.txt
@@ -0,0 +1,2 @@
+To turn off OS verification, press ENTER.
+Your system will reboot and local data will be cleared.
diff --git a/scripts/newbitmaps/strings/localized_text/es/tonorm.txt b/scripts/newbitmaps/strings/localized_text/es/tonorm.txt
new file mode 100644
index 00000000..e394be70
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/es/tonorm.txt
@@ -0,0 +1,4 @@
+OS verification is OFF
+
+Press ENTER to confirm you wish to turn OS verification on.
+Your system will reboot and local data will be cleared.
diff --git a/scripts/newbitmaps/strings/localized_text/es_419/back_help.txt b/scripts/newbitmaps/strings/localized_text/es_419/back_help.txt
new file mode 100644
index 00000000..2f39438e
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/es_419/back_help.txt
@@ -0,0 +1 @@
+To go back, press ESC.
diff --git a/scripts/newbitmaps/strings/localized_text/es_419/todev.txt b/scripts/newbitmaps/strings/localized_text/es_419/todev.txt
new file mode 100644
index 00000000..072f2348
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/es_419/todev.txt
@@ -0,0 +1,2 @@
+To turn off OS verification, press ENTER.
+Your system will reboot and local data will be cleared.
diff --git a/scripts/newbitmaps/strings/localized_text/es_419/tonorm.txt b/scripts/newbitmaps/strings/localized_text/es_419/tonorm.txt
new file mode 100644
index 00000000..e394be70
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/es_419/tonorm.txt
@@ -0,0 +1,4 @@
+OS verification is OFF
+
+Press ENTER to confirm you wish to turn OS verification on.
+Your system will reboot and local data will be cleared.
diff --git a/scripts/newbitmaps/strings/localized_text/fr/back_help.txt b/scripts/newbitmaps/strings/localized_text/fr/back_help.txt
new file mode 100644
index 00000000..2f39438e
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/fr/back_help.txt
@@ -0,0 +1 @@
+To go back, press ESC.
diff --git a/scripts/newbitmaps/strings/localized_text/fr/todev.txt b/scripts/newbitmaps/strings/localized_text/fr/todev.txt
new file mode 100644
index 00000000..072f2348
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/fr/todev.txt
@@ -0,0 +1,2 @@
+To turn off OS verification, press ENTER.
+Your system will reboot and local data will be cleared.
diff --git a/scripts/newbitmaps/strings/localized_text/fr/tonorm.txt b/scripts/newbitmaps/strings/localized_text/fr/tonorm.txt
new file mode 100644
index 00000000..e394be70
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/fr/tonorm.txt
@@ -0,0 +1,4 @@
+OS verification is OFF
+
+Press ENTER to confirm you wish to turn OS verification on.
+Your system will reboot and local data will be cleared.
diff --git a/scripts/newbitmaps/strings/localized_text/it/back_help.txt b/scripts/newbitmaps/strings/localized_text/it/back_help.txt
new file mode 100644
index 00000000..2f39438e
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/it/back_help.txt
@@ -0,0 +1 @@
+To go back, press ESC.
diff --git a/scripts/newbitmaps/strings/localized_text/it/todev.txt b/scripts/newbitmaps/strings/localized_text/it/todev.txt
new file mode 100644
index 00000000..072f2348
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/it/todev.txt
@@ -0,0 +1,2 @@
+To turn off OS verification, press ENTER.
+Your system will reboot and local data will be cleared.
diff --git a/scripts/newbitmaps/strings/localized_text/it/tonorm.txt b/scripts/newbitmaps/strings/localized_text/it/tonorm.txt
new file mode 100644
index 00000000..e394be70
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/it/tonorm.txt
@@ -0,0 +1,4 @@
+OS verification is OFF
+
+Press ENTER to confirm you wish to turn OS verification on.
+Your system will reboot and local data will be cleared.
diff --git a/scripts/newbitmaps/strings/localized_text/ja/back_help.txt b/scripts/newbitmaps/strings/localized_text/ja/back_help.txt
new file mode 100644
index 00000000..2f39438e
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/ja/back_help.txt
@@ -0,0 +1 @@
+To go back, press ESC.
diff --git a/scripts/newbitmaps/strings/localized_text/ja/todev.txt b/scripts/newbitmaps/strings/localized_text/ja/todev.txt
new file mode 100644
index 00000000..072f2348
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/ja/todev.txt
@@ -0,0 +1,2 @@
+To turn off OS verification, press ENTER.
+Your system will reboot and local data will be cleared.
diff --git a/scripts/newbitmaps/strings/localized_text/ja/tonorm.txt b/scripts/newbitmaps/strings/localized_text/ja/tonorm.txt
new file mode 100644
index 00000000..e394be70
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/ja/tonorm.txt
@@ -0,0 +1,4 @@
+OS verification is OFF
+
+Press ENTER to confirm you wish to turn OS verification on.
+Your system will reboot and local data will be cleared.
diff --git a/scripts/newbitmaps/strings/localized_text/ko/back_help.txt b/scripts/newbitmaps/strings/localized_text/ko/back_help.txt
new file mode 100644
index 00000000..2f39438e
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/ko/back_help.txt
@@ -0,0 +1 @@
+To go back, press ESC.
diff --git a/scripts/newbitmaps/strings/localized_text/ko/todev.txt b/scripts/newbitmaps/strings/localized_text/ko/todev.txt
new file mode 100644
index 00000000..072f2348
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/ko/todev.txt
@@ -0,0 +1,2 @@
+To turn off OS verification, press ENTER.
+Your system will reboot and local data will be cleared.
diff --git a/scripts/newbitmaps/strings/localized_text/ko/tonorm.txt b/scripts/newbitmaps/strings/localized_text/ko/tonorm.txt
new file mode 100644
index 00000000..e394be70
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/ko/tonorm.txt
@@ -0,0 +1,4 @@
+OS verification is OFF
+
+Press ENTER to confirm you wish to turn OS verification on.
+Your system will reboot and local data will be cleared.
diff --git a/scripts/newbitmaps/strings/localized_text/nl/back_help.txt b/scripts/newbitmaps/strings/localized_text/nl/back_help.txt
new file mode 100644
index 00000000..2f39438e
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/nl/back_help.txt
@@ -0,0 +1 @@
+To go back, press ESC.
diff --git a/scripts/newbitmaps/strings/localized_text/nl/todev.txt b/scripts/newbitmaps/strings/localized_text/nl/todev.txt
new file mode 100644
index 00000000..072f2348
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/nl/todev.txt
@@ -0,0 +1,2 @@
+To turn off OS verification, press ENTER.
+Your system will reboot and local data will be cleared.
diff --git a/scripts/newbitmaps/strings/localized_text/nl/tonorm.txt b/scripts/newbitmaps/strings/localized_text/nl/tonorm.txt
new file mode 100644
index 00000000..e394be70
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/nl/tonorm.txt
@@ -0,0 +1,4 @@
+OS verification is OFF
+
+Press ENTER to confirm you wish to turn OS verification on.
+Your system will reboot and local data will be cleared.
diff --git a/scripts/newbitmaps/strings/localized_text/no/back_help.txt b/scripts/newbitmaps/strings/localized_text/no/back_help.txt
new file mode 100644
index 00000000..2f39438e
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/no/back_help.txt
@@ -0,0 +1 @@
+To go back, press ESC.
diff --git a/scripts/newbitmaps/strings/localized_text/no/todev.txt b/scripts/newbitmaps/strings/localized_text/no/todev.txt
new file mode 100644
index 00000000..072f2348
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/no/todev.txt
@@ -0,0 +1,2 @@
+To turn off OS verification, press ENTER.
+Your system will reboot and local data will be cleared.
diff --git a/scripts/newbitmaps/strings/localized_text/no/tonorm.txt b/scripts/newbitmaps/strings/localized_text/no/tonorm.txt
new file mode 100644
index 00000000..e394be70
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/no/tonorm.txt
@@ -0,0 +1,4 @@
+OS verification is OFF
+
+Press ENTER to confirm you wish to turn OS verification on.
+Your system will reboot and local data will be cleared.
diff --git a/scripts/newbitmaps/strings/localized_text/pt_BR/back_help.txt b/scripts/newbitmaps/strings/localized_text/pt_BR/back_help.txt
new file mode 100644
index 00000000..2f39438e
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/pt_BR/back_help.txt
@@ -0,0 +1 @@
+To go back, press ESC.
diff --git a/scripts/newbitmaps/strings/localized_text/pt_BR/todev.txt b/scripts/newbitmaps/strings/localized_text/pt_BR/todev.txt
new file mode 100644
index 00000000..072f2348
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/pt_BR/todev.txt
@@ -0,0 +1,2 @@
+To turn off OS verification, press ENTER.
+Your system will reboot and local data will be cleared.
diff --git a/scripts/newbitmaps/strings/localized_text/pt_BR/tonorm.txt b/scripts/newbitmaps/strings/localized_text/pt_BR/tonorm.txt
new file mode 100644
index 00000000..e394be70
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/pt_BR/tonorm.txt
@@ -0,0 +1,4 @@
+OS verification is OFF
+
+Press ENTER to confirm you wish to turn OS verification on.
+Your system will reboot and local data will be cleared.
diff --git a/scripts/newbitmaps/strings/localized_text/sv/back_help.txt b/scripts/newbitmaps/strings/localized_text/sv/back_help.txt
new file mode 100644
index 00000000..2f39438e
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/sv/back_help.txt
@@ -0,0 +1 @@
+To go back, press ESC.
diff --git a/scripts/newbitmaps/strings/localized_text/sv/todev.txt b/scripts/newbitmaps/strings/localized_text/sv/todev.txt
new file mode 100644
index 00000000..072f2348
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/sv/todev.txt
@@ -0,0 +1,2 @@
+To turn off OS verification, press ENTER.
+Your system will reboot and local data will be cleared.
diff --git a/scripts/newbitmaps/strings/localized_text/sv/tonorm.txt b/scripts/newbitmaps/strings/localized_text/sv/tonorm.txt
new file mode 100644
index 00000000..e394be70
--- /dev/null
+++ b/scripts/newbitmaps/strings/localized_text/sv/tonorm.txt
@@ -0,0 +1,4 @@
+OS verification is OFF
+
+Press ENTER to confirm you wish to turn OS verification on.
+Your system will reboot and local data will be cleared.