PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GUI: Use standard routine for auto-reboot

Browse Source 
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
This commit is contained in:
Matt Mower
2016-08-19 11:28:27 -05:00
committed by Ethan Yonker
parent 8dc25b7984
commit 908dd25139
3 changed files with 65 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui/theme/common/landscape.xml
+20 -34
View File
@@ -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
View File
@@ -386,9 +386,9 @@
</checkbox>
<checkbox>
<placement x="%indent%" y="%row13a_y%"/>
<placement x="%indent%" y="%row13a_y%" />
<text>{@install_reboot_chk=Reboot after installation is complete}</text>
<data variable="tw_install_reboot"/>
<data variable="tw_install_reboot" />
</checkbox>
<checkbox>
@@ -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
View File
@@ -526,9 +526,9 @@
</checkbox>
<checkbox>
<placement x="%indent%" y="%row4_y%"/>
<placement x="%indent%" y="%row4_y%" />
<text>{@install_reboot_chk=Reboot after installation is complete}</text>
<data variable="tw_install_reboot"/>
<data variable="tw_install_reboot" />
</checkbox>
<button>
@@ -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>