Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 908dd251 authored by Matt Mower's avatar Matt Mower Committed by Ethan Yonker
Browse files

GUI: Use standard routine for auto-reboot 

If 'reboot after install' is enabled, follow the standard reboot
routine to process 'No OS' and 'Install SuperSU' checks.

Since the system reboot routine is repeated several times, it has been
separated into its own routine.

Change-Id: I4c1882ecb8dc2d153ec2378b2e0973ab1a2a8278
parent 8dc25b79

gui/theme/common/landscape.xml

+20 −34
Original line number Diff line number Diff line
@@ -548,18 +548,7 @@ 
				<text>{@reboot_system_btn=Reboot System}</text>

				<actions>

					<action function="set">tw_back=main2</action>

					<action function="set">tw_action=reboot</action>

					<action function="set">tw_action_param=system</action>

					<action function="set">tw_has_action2=0</action>

					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>

					<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>

					<action function="set">tw_text3=</action>

					<action function="set">tw_text4=</action>

					<action function="set">tw_action_text1={@rebooting=Rebooting...}</action>

					<action function="set">tw_action_text2=</action>

					<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>

					<action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action>

					<action function="page">rebootcheck</action>

					<action function="page">reboot_system_routine</action>

				</actions>

			</button>
@@ -734,6 +723,23 @@ 
			</action>

		</page>



		<page name="reboot_system_routine">

			<action>

				<action function="set">tw_action=reboot</action>

				<action function="set">tw_action_param=system</action>

				<action function="set">tw_has_action2=0</action>

				<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>

				<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>

				<action function="set">tw_text3=</action>

				<action function="set">tw_text4=</action>

				<action function="set">tw_action_text1={@rebooting=Rebooting...}</action>

				<action function="set">tw_action_text2=</action>

				<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>

				<action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action>

				<action function="page">rebootcheck</action>

			</action>

		</page>



		<page name="confirm_action">

			<template name="page"/>
@@ -914,18 +920,7 @@ 
				<text>{@reboot_system_btn=Reboot System}</text>

				<actions>

					<action function="set">tw_back=main2</action>

					<action function="set">tw_action=reboot</action>

					<action function="set">tw_action_param=system</action>

					<action function="set">tw_has_action2=0</action>

					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>

					<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>

					<action function="set">tw_text3=</action>

					<action function="set">tw_text4=</action>

					<action function="set">tw_action_text1={@rebooting=Rebooting...}</action>

					<action function="set">tw_action_text2=</action>

					<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>

					<action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action>

					<action function="page">rebootcheck</action>

					<action function="page">reboot_system_routine</action>

				</actions>

			</button>
@@ -2589,16 +2584,7 @@ 
				<text>{@rb_system_btn=System}</text>

				<actions>

					<action function="set">tw_back=reboot</action>

					<action function="set">tw_action=reboot</action>

					<action function="set">tw_action_param=system</action>

					<action function="set">tw_has_action2=0</action>

					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>

					<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>

					<action function="set">tw_action_text1={@rebooting=Rebooting...}</action>

					<action function="set">tw_action_text2=</action>

					<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>

					<action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action>

					<action function="page">rebootcheck</action>

					<action function="page">reboot_system_routine</action>

				</actions>

			</button>

gui/theme/common/portrait.xml

+22 −35
Original line number Diff line number Diff line
@@ -500,18 +500,7 @@ 
				<text>{@reboot_system_btn=Reboot System}</text>

				<actions>

					<action function="set">tw_back=main2</action>

					<action function="set">tw_action=reboot</action>

					<action function="set">tw_action_param=system</action>

					<action function="set">tw_has_action2=0</action>

					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>

					<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>

					<action function="set">tw_text3=</action>

					<action function="set">tw_text4=</action>

					<action function="set">tw_action_text1={@rebooting=Rebooting...}</action>

					<action function="set">tw_action_text2=</action>

					<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>

					<action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action>

					<action function="page">rebootcheck</action>

					<action function="page">reboot_system_routine</action>

				</actions>

			</button>
@@ -686,6 +675,23 @@ 
			</action>

		</page>



		<page name="reboot_system_routine">

			<action>

				<action function="set">tw_action=reboot</action>

				<action function="set">tw_action_param=system</action>

				<action function="set">tw_has_action2=0</action>

				<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>

				<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>

				<action function="set">tw_text3=</action>

				<action function="set">tw_text4=</action>

				<action function="set">tw_action_text1={@rebooting=Rebooting...}</action>

				<action function="set">tw_action_text2=</action>

				<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>

				<action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action>

				<action function="page">rebootcheck</action>

			</action>

		</page>



		<page name="confirm_action">

			<template name="page"/>
@@ -866,18 +872,7 @@ 
				<text>{@reboot_system_btn=Reboot System}</text>

				<actions>

					<action function="set">tw_back=main2</action>

					<action function="set">tw_action=reboot</action>

					<action function="set">tw_action_param=system</action>

					<action function="set">tw_has_action2=0</action>

					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>

					<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>

					<action function="set">tw_text3=</action>

					<action function="set">tw_text4=</action>

					<action function="set">tw_action_text1={@rebooting=Rebooting...}</action>

					<action function="set">tw_action_text2=</action>

					<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>

					<action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action>

					<action function="page">rebootcheck</action>

					<action function="page">reboot_system_routine</action>

				</actions>

			</button>
@@ -2708,15 +2703,7 @@ 
				<text>{@rb_system_btn=System}</text>

				<actions>

					<action function="set">tw_back=reboot</action>

					<action function="set">tw_action=reboot</action>

					<action function="set">tw_action_param=system</action>

					<action function="set">tw_has_action2=0</action>

					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>

					<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>

					<action function="set">tw_action_text1={@rebooting=Rebooting...}</action>

					<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>

					<action function="set">tw_slider_text={@swipe_reboot=Swipe to Reboot}</action>

					<action function="page">rebootcheck</action>

					<action function="page">reboot_system_routine</action>

				</actions>

			</button>

gui/theme/common/watch.xml

+23 −35
Original line number Diff line number Diff line
@@ -704,18 +704,7 @@ 
				<text>{@reboot_system_btn=Reboot System}</text>

				<actions>

					<action function="set">tw_back=main2</action>

					<action function="set">tw_action=reboot</action>

					<action function="set">tw_action_param=system</action>

					<action function="set">tw_has_action2=0</action>

					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>

					<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>

					<action function="set">tw_text3=</action>

					<action function="set">tw_text4=</action>

					<action function="set">tw_action_text1={@rebooting=Rebooting...}</action>

					<action function="set">tw_action_text2=</action>

					<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>

					<action function="set">tw_slider_text={@swipe_reboot_s=   Reboot}</action>

					<action function="page">rebootcheck</action>

					<action function="page">reboot_system_routine</action>

				</actions>

			</button>
@@ -928,6 +917,24 @@ 
			</action>

		</page>



		<page name="reboot_system_routine">

			<action>

				<action function="set">tw_back=main2</action>

				<action function="set">tw_action=reboot</action>

				<action function="set">tw_action_param=system</action>

				<action function="set">tw_has_action2=0</action>

				<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>

				<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>

				<action function="set">tw_text3=</action>

				<action function="set">tw_text4=</action>

				<action function="set">tw_action_text1={@rebooting=Rebooting...}</action>

				<action function="set">tw_action_text2=</action>

				<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>

				<action function="set">tw_slider_text={@swipe_reboot_s=   Reboot}</action>

				<action function="page">rebootcheck</action>

			</action>

		</page>



		<page name="confirm_action">

			<template name="page"/>
@@ -1110,18 +1117,7 @@ 
				<text>{@reboot_system_btn=Reboot System}</text>

				<actions>

					<action function="set">tw_back=main2</action>

					<action function="set">tw_action=reboot</action>

					<action function="set">tw_action_param=system</action>

					<action function="set">tw_has_action2=0</action>

					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>

					<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>

					<action function="set">tw_text3=</action>

					<action function="set">tw_text4=</action>

					<action function="set">tw_action_text1={@rebooting=Rebooting...}</action>

					<action function="set">tw_action_text2=</action>

					<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>

					<action function="set">tw_slider_text={@swipe_reboot_s=   Reboot}</action>

					<action function="page">rebootcheck</action>

					<action function="page">reboot_system_routine</action>

				</actions>

			</button>
@@ -3220,15 +3216,7 @@ 
				<text>{@rb_system_btn=System}</text>

				<actions>

					<action function="set">tw_back=reboot</action>

					<action function="set">tw_action=reboot</action>

					<action function="set">tw_action_param=system</action>

					<action function="set">tw_has_action2=0</action>

					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>

					<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>

					<action function="set">tw_action_text1={@rebooting=Rebooting...}</action>

					<action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>

					<action function="set">tw_slider_text={@swipe_reboot_s=   Reboot}</action>

					<action function="page">rebootcheck</action>

					<action function="page">reboot_system_routine</action>

				</actions>

			</button>