Remove TWRP app prompt from reboot flow
Add option to install TWRP app as a list menu item on the
advanced page and as a button on the reboot page (except for
watch theme). Now when a user reboots the device, they no longer
will be prompted to install the TWRP app, which interrupts the
flow of rebooting the device.
Change-Id: I00559d0be6e7d0b00d469a5960e4b14e32a3fc5f
diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 44452b6..62a1191 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -1015,7 +1015,7 @@
<page name="rebootcheck">
<action>
<condition var1="tw_backup_system_size" op=">=" var2="%tw_min_system%"/>
- <action function="page">appcheck</action>
+ <action function="reboot">%tw_reboot_param%</action>
</action>
<action>
@@ -1024,28 +1024,6 @@
</action>
</page>
- <page name="appcheck">
- <action>
- <condition var1="tw_app_prompt" var2="1"/>
- <action function="checkforapp"></action>
- </action>
-
- <action>
- <condition var1="tw_app_prompt" op="!=" var2="1"/>
- <action function="reboot">%tw_reboot_param%</action>
- </action>
-
- <action>
- <condition var1="tw_app_install_status" var2="1"/>
- <action function="page">rebootapp</action>
- </action>
-
- <action>
- <condition var1="tw_app_install_status" var2="2"/>
- <action function="reboot">%tw_reboot_param%</action>
- </action>
- </page>
-
<page name="wipe">
<template name="page"/>
@@ -2713,6 +2691,13 @@
</page>
<page name="reboot">
+ <action>
+ <action function="checkforapp"></action>
+ <action function="page">reboot2</action>
+ </action>
+ </page>
+
+ <page name="reboot2">
<template name="page"/>
<text style="text_l">
@@ -2817,9 +2802,20 @@
</button>
</listbox>
+ <button style="main_button">
+ <condition var1="tw_app_install_status" var2="1"/>
+ <placement x="%center_x%" y="%row12_y%"/>
+ <text>{@reboot_install_app_hdr=Install TWRP App}</text>
+ <actions>
+ <action function="set">tw_back=reboot</action>
+ <action function="set">tw_appinstall_title={@reboot_hdr=Reboot}</action>
+ <action function="page">installapp</action>
+ </actions>
+ </button>
+
<text style="text_m">
<condition var1="tw_has_boot_slots" var2="1"/>
- <placement x="%center_x%" y="%row14_y%" placement="5"/>
+ <placement x="%col1_x_header%" y="%row14_y%"/>
<text>{@current_boot_slot=Current Slot: %tw_active_slot%}</text>
</text>
@@ -2866,17 +2862,17 @@
</action>
</page>
- <page name="rebootapp">
+ <page name="installapp">
<template name="page"/>
<text style="text_l">
<placement x="%col1_x_header%" y="%row3_header_y%"/>
- <text>{@reboot_hdr=Reboot}</text>
+ <text>%tw_appinstall_title%</text>
</text>
<text style="text_m">
<placement x="%col1_x_header%" y="%row4_header_y%"/>
- <text>{@reboot_install_app_hdr=Install TWRP App?}</text>
+ <text>{@reboot_install_app_hdr=Install TWRP App}</text>
</text>
<text style="text_m_accent">
@@ -2890,12 +2886,6 @@
</text>
<checkbox>
- <placement x="%indent%" y="%row5_y%"/>
- <text>{@reboot_install_app_prompt_install=Prompt to install TWRP app if not installed}</text>
- <data variable="tw_app_prompt"/>
- </checkbox>
-
- <checkbox>
<condition var1="tw_mount_system_ro" var2="0"/>
<placement x="%indent%" y="%row7_y%"/>
<text>{@reboot_install_app_system=Install as a System App}</text>
@@ -2905,20 +2895,16 @@
<button style="main_button_half_width">
<placement x="%col2_x_left%" y="%row15a_y%"/>
<text>{@install_cancel=Do not Install}</text>
- <action function="reboot">%tw_reboot_param%</action>
+ <action function="page">%tw_back%</action>
</button>
<slider>
<text>{@swipe_to_install_app=Swipe to Install TWRP App}</text>
<actions>
- <action function="set">tw_back=reboot</action>
<action function="set">tw_action=installapp</action>
<action function="set">tw_action_text1={@reboot_installing_app=Installing App...}</action>
<action function="set">tw_action_text2=</action>
- <action function="set">tw_has_action2=1</action>
- <action function="set">tw_action2=reboot</action>
- <action function="set">tw_action2_param=%tw_reboot_param%</action>
- <action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>
+ <action function="set">tw_complete_text1={@successful=Successful}</action>
<action function="page">action_page</action>
</actions>
</slider>
@@ -2935,7 +2921,7 @@
<touch key="back"/>
<actions>
<action function="set">tw_app_install_status=0</action>
- <action function="page">reboot</action>
+ <action function="page">%tw_back%</action>
</actions>
</action>
</page>
@@ -3044,9 +3030,6 @@
<listitem name="{@use24clock_chk=Use 24-hour clock}">
<data variable="tw_military_time"/>
</listitem>
- <listitem name="{@reboot_install_app_prompt_install=Prompt to install TWRP app on every reboot}">
- <data variable="tw_app_prompt"/>
- </listitem>
<listitem name="{@simact_chk=Simulate actions for theme testing}">
<data variable="tw_simulate_actions"/>
</listitem>
@@ -3459,6 +3442,13 @@
</page>
<page name="advanced">
+ <action>
+ <action function="checkforapp"></action>
+ <action function="page">advanced1</action>
+ </action>
+ </page>
+
+ <page name="advanced1">
<template name="page"/>
<text style="text_l">
@@ -3567,6 +3557,14 @@
<action function="page">confirm_action</action>
</actions>
</listitem>
+ <listitem name="{@reboot_install_app_hdr=Install TWRP App}">
+ <condition var1="tw_app_install_status" var2="1"/>
+ <actions>
+ <action function="set">tw_back=advanced</action>
+ <action function="set">tw_appinstall_title={@advanced_hdr=Advanced}</action>
+ <action function="page">installapp</action>
+ </actions>
+ </listitem>
<listitem name="{@uninstall_twrp_system_app=Uninstall TWRP App from System}">
<condition var1="tw_app_installed_in_system" var2="1"/>
<actions>
diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index f3a31ce..6432524 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -119,7 +119,7 @@
<string name="rebooting">Rebooting...</string>
<string name="swipe_reboot">Swipe to Reboot</string>
<string name="swipe_reboot_s"> Reboot</string>
- <string name="reboot_install_app_hdr">Install TWRP App?</string>
+ <string name="reboot_install_app_hdr">Install TWRP App</string>
<string name="reboot_install_app1">Would you like to install the Official TWRP App?</string>
<string name="reboot_install_app2">The app can check for new TWRP versions.</string>
<string name="reboot_install_app_prompt_install">Prompt to install TWRP app if not installed</string>
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index f24edba..711139f 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -966,7 +966,7 @@
<page name="rebootcheck">
<action>
<condition var1="tw_backup_system_size" op=">=" var2="%tw_min_system%"/>
- <action function="page">appcheck</action>
+ <action function="reboot">%tw_reboot_param%</action>
</action>
<action>
@@ -975,28 +975,6 @@
</action>
</page>
- <page name="appcheck">
- <action>
- <condition var1="tw_app_prompt" var2="1"/>
- <action function="checkforapp"></action>
- </action>
-
- <action>
- <condition var1="tw_app_prompt" op="!=" var2="1"/>
- <action function="reboot">%tw_reboot_param%</action>
- </action>
-
- <action>
- <condition var1="tw_app_install_status" var2="1"/>
- <action function="page">rebootapp</action>
- </action>
-
- <action>
- <condition var1="tw_app_install_status" var2="2"/>
- <action function="reboot">%tw_reboot_param%</action>
- </action>
- </page>
-
<page name="wipe">
<template name="page"/>
@@ -2869,6 +2847,13 @@
</page>
<page name="reboot">
+ <action>
+ <action function="checkforapp"></action>
+ <action function="page">reboot2</action>
+ </action>
+ </page>
+
+ <page name="reboot2">
<template name="page"/>
<text style="text_l">
@@ -3011,6 +2996,17 @@
</actions>
</button>
+ <button style="main_button_half_height">
+ <condition var1="tw_app_install_status" var2="1"/>
+ <placement x="%indent%" y="%row22_y%"/>
+ <text>{@reboot_install_app_hdr=Install TWRP App}</text>
+ <actions>
+ <action function="set">tw_back=reboot</action>
+ <action function="set">tw_appinstall_title={@reboot_hdr=Reboot}</action>
+ <action function="page">installapp</action>
+ </actions>
+ </button>
+
<action>
<touch key="home"/>
<action function="page">main</action>
@@ -3022,17 +3018,17 @@
</action>
</page>
- <page name="rebootapp">
+ <page name="installapp">
<template name="page"/>
<text style="text_l">
<placement x="%col1_x_header%" y="%row3_header_y%"/>
- <text>{@reboot_hdr=Reboot}</text>
+ <text>%tw_appinstall_title%</text>
</text>
<text style="text_m">
<placement x="%col1_x_header%" y="%row4_header_y%"/>
- <text>{@reboot_install_app_hdr=Install TWRP App?}</text>
+ <text>{@reboot_install_app_hdr=Install TWRP App}</text>
</text>
<text style="text_m_accent">
@@ -3046,12 +3042,6 @@
</text>
<checkbox>
- <placement x="%indent%" y="%row5_y%"/>
- <text>{@reboot_install_app_prompt_install=Prompt to install TWRP app if not installed}</text>
- <data variable="tw_app_prompt"/>
- </checkbox>
-
- <checkbox>
<condition var1="tw_mount_system_ro" var2="0"/>
<placement x="%indent%" y="%row7_y%"/>
<text>{@reboot_install_app_system=Install as a System App}</text>
@@ -3061,20 +3051,16 @@
<button style="main_button_half_height">
<placement x="%indent%" y="%row16_y%"/>
<text>{@install_cancel=Do not Install}</text>
- <action function="reboot">%tw_reboot_param%</action>
+ <action function="page">%tw_back%</action>
</button>
<slider>
<text>{@swipe_to_install_app=Swipe to Install TWRP App}</text>
<actions>
- <action function="set">tw_back=reboot</action>
<action function="set">tw_action=installapp</action>
<action function="set">tw_action_text1={@reboot_installing_app=Installing App...}</action>
<action function="set">tw_action_text2=</action>
- <action function="set">tw_has_action2=1</action>
- <action function="set">tw_action2=reboot</action>
- <action function="set">tw_action2_param=%tw_reboot_param%</action>
- <action function="set">tw_complete_text1={@rebooting=Rebooting...}</action>
+ <action function="set">tw_complete_text1={@successful=Successful}</action>
<action function="page">action_page</action>
</actions>
</slider>
@@ -3091,7 +3077,7 @@
<touch key="back"/>
<actions>
<action function="set">tw_app_install_status=0</action>
- <action function="page">reboot</action>
+ <action function="page">%tw_back%</action>
</actions>
</action>
</page>
@@ -3218,9 +3204,6 @@
<listitem name="{@rev_navbar_chk=Reversed navbar layout}">
<data variable="tw_samsung_navbar"/>
</listitem>
- <listitem name="{@reboot_install_app_prompt_install=Prompt to install TWRP app on every reboot}">
- <data variable="tw_app_prompt"/>
- </listitem>
<listitem name="{@simact_chk=Simulate actions for theme testing}">
<data variable="tw_simulate_actions"/>
</listitem>
@@ -3580,6 +3563,13 @@
</page>
<page name="advanced">
+ <action>
+ <action function="checkforapp"></action>
+ <action function="page">advanced1</action>
+ </action>
+ </page>
+
+ <page name="advanced1">
<template name="page"/>
<text style="text_l">
@@ -3689,6 +3679,14 @@
<action function="page">confirm_action</action>
</actions>
</listitem>
+ <listitem name="{@reboot_install_app_hdr=Install TWRP App}">
+ <condition var1="tw_app_install_status" var2="1"/>
+ <actions>
+ <action function="set">tw_back=advanced</action>
+ <action function="set">tw_appinstall_title={@advanced_hdr=Advanced}</action>
+ <action function="page">installapp</action>
+ </actions>
+ </listitem>
<listitem name="{@uninstall_twrp_system_app=Uninstall TWRP App from System}">
<condition var1="tw_app_installed_in_system" var2="1"/>
<actions>
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index 7421203..d76a1d3 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -1234,7 +1234,7 @@
<page name="rebootcheck">
<action>
<condition var1="tw_backup_system_size" op=">=" var2="%tw_min_system%"/>
- <action function="page">appcheck</action>
+ <action function="reboot">%tw_reboot_param%</action>
</action>
<action>
@@ -1243,28 +1243,6 @@
</action>
</page>
- <page name="appcheck">
- <action>
- <condition var1="tw_app_prompt" var2="1"/>
- <action function="checkforapp"></action>
- </action>
-
- <action>
- <condition var1="tw_app_prompt" op="!=" var2="1"/>
- <action function="reboot">%tw_reboot_param%</action>
- </action>
-
- <action>
- <condition var1="tw_app_install_status" var2="1"/>
- <action function="page">rebootapp</action>
- </action>
-
- <action>
- <condition var1="tw_app_install_status" var2="2"/>
- <action function="reboot">%tw_reboot_param%</action>
- </action>
- </page>
-
<page name="wipe_type1">
<template name="page"/>
@@ -3365,6 +3343,13 @@
</page>
<page name="reboot">
+ <action>
+ <action function="checkforapp"></action>
+ <action function="page">reboot2</action>
+ </action>
+ </page>
+
+ <page name="reboot2">
<template name="page"/>
<template name="statusbar"/>
@@ -3459,6 +3444,7 @@
<action function="page">rebootcheck</action>
</actions>
</button>
+
<button style="main_button">
<condition var1="tw_edl_mode" var2="1"/>
<placement x="%col1_x_right%" y="%row11_y%"/>
@@ -3489,14 +3475,14 @@
</action>
</page>
- <page name="rebootapp">
+ <page name="installapp">
<template name="page"/>
<template name="statusbar"/>
<text style="text_m">
<placement x="%col1_x_left%" y="%row1_header_y%"/>
- <text>{@reboot_hdr=Reboot} > {@reboot_install_app_hdr=Install TWRP App?}</text>
+ <text>%tw_appinstall_title% > {@reboot_install_app_hdr=Install TWRP App}</text>
</text>
<text style="text_m_accent">
@@ -3510,12 +3496,6 @@
</text>
<checkbox>
- <placement x="%indent%" y="%row3_y%"/>
- <text>{@reboot_install_app_prompt_install=Prompt to install TWRP app if not installed}</text>
- <data variable="tw_app_prompt"/>
- </checkbox>
-
- <checkbox>
<condition var1="tw_mount_system_ro" var2="0"/>
<placement x="%indent%" y="%row5_y%"/>
<text>{@reboot_install_app_system=Install as a System App}</text>
@@ -3525,9 +3505,20 @@
<button style="main_button_half_height">
<placement x="%indent%" y="%row7_y%"/>
<text>{@install_cancel=Do not Install}</text>
- <action function="reboot">%tw_reboot_param%</action>
+ <action function="page">%tw_back%</action>
</button>
+ <slider>
+ <text>{@swipe_confirm= Confirm}</text>
+ <actions>
+ <action function="set">tw_action=installapp</action>
+ <action function="set">tw_action_text1={@reboot_installing_app=Installing App...}</action>
+ <action function="set">tw_action_text2=</action>
+ <action function="set">tw_complete_text1={@successful=Successful}</action>
+ <action function="page">action_page</action>
+ </actions>
+ </slider>
+
<action>
<touch key="home"/>
<actions>
@@ -3540,7 +3531,7 @@
<touch key="back"/>
<actions>
<action function="set">tw_app_install_status=0</action>
- <action function="page">reboot</action>
+ <action function="page">%tw_back%</action>
</actions>
</action>
</page>
@@ -3716,9 +3707,6 @@
<listitem name="{@use24clock_chk=Use 24-hour clock}">
<data variable="tw_military_time"/>
</listitem>
- <listitem name="{@reboot_install_app_prompt_install=Prompt to install TWRP app on every reboot}">
- <data variable="tw_app_prompt"/>
- </listitem>
<listitem name="{@simact_chk=Simulate actions for theme testing}">
<data variable="tw_simulate_actions"/>
</listitem>
@@ -4226,6 +4214,13 @@
</page>
<page name="advanced2">
+ <action>
+ <action function="checkforapp"></action>
+ <action function="page">advanced3</action>
+ </action>
+ </page>
+
+ <page name="advanced3">
<template name="page"/>
<template name="statusbar"/>
@@ -4308,6 +4303,14 @@
<action function="page">confirm_action</action>
</actions>
</listitem>
+ <listitem name="{@reboot_install_app_hdr=Install TWRP App}">
+ <condition var1="tw_app_install_status" var2="1"/>
+ <actions>
+ <action function="set">tw_back=advanced2</action>
+ <action function="set">tw_appinstall_title={@advanced_hdr=Advanced}</action>
+ <action function="page">installapp</action>
+ </actions>
+ </listitem>
<listitem name="{@uninstall_twrp_system_app=Uninstall TWRP App from System}">
<condition var1="tw_app_installed_in_system" var2="1"/>
<actions>