From 0afc1fdc4846a3c36cea4488ef76b218101425a7 Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Wed, 22 Mar 2017 15:27:47 -0500 Subject: Fix reboot when no OS is present Change-Id: Idc3d3c79b8a7acf0f632ed39703766005d73de29 --- gui/theme/common/landscape.xml | 6 +++++- gui/theme/common/portrait.xml | 6 +++++- gui/theme/common/watch.xml | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml index 6d544833f..3039252b2 100644 --- a/gui/theme/common/landscape.xml +++ b/gui/theme/common/landscape.xml @@ -726,7 +726,7 @@ tw_action=reboot - tw_reboot_param=system + tw_action_param=system tw_has_action2=0 tw_text1={@no_os1=No OS Installed! Are you} tw_text2={@no_osrb=sure you wish to reboot?} @@ -2617,6 +2617,7 @@ tw_back=reboot tw_action=reboot + tw_action_param=poweroff tw_reboot_param=poweroff tw_has_action2=0 tw_text1={@no_os1=No OS Installed! Are you} @@ -2635,6 +2636,7 @@ tw_back=reboot tw_action=reboot + tw_action_param=recovery tw_reboot_param=recovery tw_has_action2=0 tw_text1={@no_os1=No OS Installed! Are you} @@ -2653,6 +2655,7 @@ tw_back=reboot tw_action=reboot + tw_action_param=bootloader tw_reboot_param=bootloader tw_has_action2=0 tw_text1={@no_os1=No OS Installed! Are you} @@ -2671,6 +2674,7 @@ tw_back=reboot tw_action=reboot + tw_action_param=download tw_reboot_param=download tw_has_action2=0 tw_text1={@no_os1=No OS Installed! Are you} diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml index fd35364b0..962c63334 100644 --- a/gui/theme/common/portrait.xml +++ b/gui/theme/common/portrait.xml @@ -678,7 +678,7 @@ tw_action=reboot - tw_reboot_param=system + tw_action_param=system tw_has_action2=0 tw_text1={@no_os1=No OS Installed! Are you} tw_text2={@no_osrb=sure you wish to reboot?} @@ -2774,6 +2774,7 @@ tw_back=reboot tw_action=reboot + tw_action_param=poweroff tw_reboot_param=poweroff tw_has_action2=0 tw_text1={@no_os1=No OS Installed! Are you} @@ -2792,6 +2793,7 @@ tw_back=reboot tw_action=reboot + tw_action_param=recovery tw_reboot_param=recovery tw_has_action2=0 tw_text1={@no_os1=No OS Installed! Are you} @@ -2810,6 +2812,7 @@ tw_back=reboot tw_action=reboot + tw_action_param=bootloader tw_reboot_param=bootloader tw_has_action2=0 tw_text1={@no_os1=No OS Installed! Are you} @@ -2828,6 +2831,7 @@ tw_back=reboot tw_action=reboot + tw_action_param=download tw_reboot_param=download tw_has_action2=0 tw_text1={@no_os1=No OS Installed! Are you} diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml index ebfe49727..e8b05953e 100644 --- a/gui/theme/common/watch.xml +++ b/gui/theme/common/watch.xml @@ -944,7 +944,7 @@ tw_back=main2 tw_action=reboot - tw_reboot_param=system + tw_action_param=system tw_has_action2=0 tw_text1={@no_os1=No OS Installed! Are you} tw_text2={@no_osrb=sure you wish to reboot?} @@ -3272,6 +3272,7 @@ tw_back=reboot tw_action=reboot + tw_action_param=poweroff tw_reboot_param=poweroff tw_has_action2=0 tw_text1={@no_os1=No OS Installed! Are you} @@ -3290,6 +3291,7 @@ tw_back=reboot tw_action=reboot + tw_action_param=recovery tw_reboot_param=recovery tw_has_action2=0 tw_text1={@no_os1=No OS Installed! Are you} @@ -3308,6 +3310,7 @@ tw_back=reboot tw_action=reboot + tw_action_param=bootloader tw_reboot_param=bootloader tw_has_action2=0 tw_text1={@no_os1=No OS Installed! Are you} @@ -3326,6 +3329,7 @@ tw_back=reboot tw_action=reboot + tw_action_param=download tw_reboot_param=download tw_has_action2=0 tw_text1={@no_os1=No OS Installed! Are you} -- cgit v1.2.3