fastboot: implement fastbootd in twrp
fastbootd is a userspace daemon that runs in the recovery
ramdisk. It allows writing single partitions to the super
partition via fastboot CLI. When TWRP sees the fastboot option
in the misc partition during startup, it will start with
the fastbootd page and fastbootd running. Otherwise it will
run recovery normally.
Change-Id: Id7b12d29ef21dbd5950dc884dd1cd788f25357f0
diff --git a/gui/action.cpp b/gui/action.cpp
index 5e842d5..19c3d09 100755
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -33,6 +33,7 @@
#include <sys/wait.h>
#include <dirent.h>
#include <private/android_filesystem_config.h>
+#include <android-base/properties.h>
#include <string>
#include <sstream>
@@ -201,6 +202,8 @@
ADD_ACTION(setlanguage);
ADD_ACTION(checkforapp);
ADD_ACTION(togglebacklight);
+ ADD_ACTION(enableadb);
+ ADD_ACTION(enablefastboot);
// remember actions that run in the caller thread
for (mapFunc::const_iterator it = mf.begin(); it != mf.end(); ++it)
@@ -2242,3 +2245,16 @@
operation_end(op_status);
return 0;
}
+
+
+int GUIAction::enableadb(std::string arg __unused) {
+ android::base::SetProperty("sys.usb.config", "none");
+ android::base::SetProperty("sys.usb.config", "adb");
+ return 0;
+}
+
+int GUIAction::enablefastboot(std::string arg __unused) {
+ android::base::SetProperty("sys.usb.config", "none");
+ android::base::SetProperty("sys.usb.config", "fastboot");
+ return 0;
+}
diff --git a/gui/console.cpp b/gui/console.cpp
old mode 100644
new mode 100755
index 03628ec..77fdd96
--- a/gui/console.cpp
+++ b/gui/console.cpp
@@ -1,5 +1,5 @@
/*
- Copyright 2015 bigbiff/Dees_Troy TeamWin
+ Copyright 2012 - 2020 TeamWin
This file is part of TWRP/TeamWin Recovery Project.
TWRP is free software: you can redistribute it and/or modify
diff --git a/gui/gui.cpp b/gui/gui.cpp
index 4628650..2a36fec 100755
--- a/gui/gui.cpp
+++ b/gui/gui.cpp
@@ -650,8 +650,9 @@
gui_changePage("main");
break;
}
- if (DataManager::GetIntValue("tw_gui_done") != 0)
+ if (DataManager::GetIntValue("tw_gui_done") != 0) {
break;
+ }
}
if (ors_read_fd > 0)
close(ors_read_fd);
diff --git a/gui/objects.hpp b/gui/objects.hpp
old mode 100644
new mode 100755
index 24e9d24..ccfc522
--- a/gui/objects.hpp
+++ b/gui/objects.hpp
@@ -371,7 +371,8 @@
int uninstalltwrpsystemapp(std::string arg);
int repackimage(std::string arg);
int fixabrecoverybootloop(std::string arg);
-
+ int enableadb(std::string arg);
+ int enablefastboot(std::string arg);
int simulate;
};
diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 67c8f91..3fbac9e 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -2639,6 +2639,133 @@
</action>
</page>
+ <page name="fastbootreboot">
+ <template name="page"/>
+
+ <text style="text_l">
+ <placement x="%col1_x_header%" y="%row3_header_y%"/>
+ <text>{@reboot_hdr=Reboot}</text>
+ </text>
+
+ <listbox style="advanced_listbox">
+ <placement x="%col1_x_left%" y="%row2_y%" w="%content_width%" h="%listbox_advanced_height%"/>
+
+ <listitem name="{@rb_system_btn=System}">
+ <condition var1="tw_reboot_system" var2="1"/>
+ <actions>
+ <action function="set">tw_back=fastbootreboot</action>
+ <action function="set">tw_action=reboot</action>
+ <action function="set">tw_action_param=system</action>
+ <action function="set">tw_reboot_param=system</action>
+ <action function="set">tw_has_action2=0</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">confirm_action</action>
+ </actions>
+ </listitem>
+
+ <listitem name="{@rb_poweroff_btn=Power Off}">
+ <condition var1="tw_reboot_poweroff" var2="1"/>
+ <actions>
+ <action function="set">tw_back=fastbootreboot</action>
+ <action function="set">tw_action=reboot</action>
+ <action function="set">tw_action_param=poweroff</action>
+ <action function="set">tw_reboot_param=poweroff</action>
+ <action function="set">tw_has_action2=0</action>
+ <action function="set">tw_action_text1={@turning_off=Turning Off...}</action>
+ <action function="set">tw_complete_text1={@turning_off=Turning Off...}</action>
+ <action function="set">tw_slider_text={@swipe_power_off=Swipe to Power Off}</action>
+ <action function="page">confirm_action</action>
+ </actions>
+ </listitem>
+
+ <listitem name="{@rb_recovery_btn=Recovery}">
+ <condition var1="tw_reboot_recovery" var2="1"/>
+ <actions>
+ <action function="set">tw_back=fastbootreboot</action>
+ <action function="set">tw_action=reboot</action>
+ <action function="set">tw_action_param=recovery</action>
+ <action function="set">tw_reboot_param=recovery</action>
+ <action function="set">tw_has_action2=0</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">confirm_action</action>
+ </actions>
+ </listitem>
+
+ <listitem name="{@rb_bootloader_btn=Bootloader}">
+ <condition var1="tw_reboot_bootloader" var2="1"/>
+ <actions>
+ <action function="set">tw_back=fastbootreboot</action>
+ <action function="set">tw_action=reboot</action>
+ <action function="set">tw_action_param=bootloader</action>
+ <action function="set">tw_reboot_param=bootloader</action>
+ <action function="set">tw_has_action2=0</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">confirm_action</action>
+ </actions>
+ </listitem>
+
+ <listitem name="{@rb_download_btn=Download}">
+ <condition var1="tw_download_mode" var2="1"/>
+ <actions>
+ <action function="set">tw_back=fastbootreboot</action>
+ <action function="set">tw_action=reboot</action>
+ <action function="set">tw_action_param=download</action>
+ <action function="set">tw_reboot_param=download</action>
+ <action function="set">tw_has_action2=0</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">confirm_action</action>
+ </actions>
+ </listitem>
+
+ <listitem name="{@fastboot_button=Fastboot}">
+ <condition var1="tw_fastboot_mode" var2="1"/>
+ <actions>
+ <action function="set">tw_back=fastbootreboot</action>
+ <action function="set">tw_action=reboot</action>
+ <action function="set">tw_action_param=fastboot</action>
+ <action function="set">tw_reboot_param=fastboot</action>
+ <action function="set">tw_has_action2=0</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">confirm_action</action>
+ </actions>
+ </listitem>
+
+ <listitem name="{@rb_edl_btn=Edl}">
+ <condition var1="tw_edl_mode" var2="1"/>
+ <actions>
+ <action function="set">tw_back=fastbootreboot</action>
+ <action function="set">tw_action=reboot</action>
+ <action function="set">tw_action_param=edl</action>
+ <action function="set">tw_reboot_param=edl</action>
+ <action function="set">tw_has_action2=0</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">confirm_action</action>
+ </actions>
+ </listitem>
+ </listbox>
+ <action>
+ <touch key="home"/>
+ <action function="page">fastboot</action>
+ </action>
+
+ <action>
+ <touch key="back"/>
+ <action function="page">fastboot</action>
+ </action>
+ </page>
+
<page name="reboot">
<template name="page"/>
@@ -2647,108 +2774,156 @@
<text>{@reboot_hdr=Reboot}</text>
</text>
+ <listbox style="advanced_listbox">
+ <placement x="%col1_x_left%" y="%row2_y%" w="%content_width%" h="%listbox_advanced_height%"/>
+
+ <listitem name="{@rb_system_btn=System}">
+ <condition var1="tw_reboot_system" var2="1"/>
+ <actions>
+ <action function="set">tw_back=reboot</action>
+ <action function="page">reboot_system_routine</action>
+ </actions>
+ </listitem>
+
+ <listitem name="{@rb_poweroff_btn=Power Off}">
+ <condition var1="tw_reboot_poweroff" var2="1"/>
+ <actions>
+ <action function="set">tw_back=reboot</action>
+ <action function="set">tw_action=reboot</action>
+ <action function="set">tw_action_param=poweroff</action>
+ <action function="set">tw_reboot_param=poweroff</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_ospo=sure you wish to power off?}</action>
+ <action function="set">tw_action_text1={@turning_off=Turning Off...}</action>
+ <action function="set">tw_complete_text1={@turning_off=Turning Off...}</action>
+ <action function="set">tw_slider_text={@swipe_power_off=Swipe to Power Off}</action>
+ <action function="page">rebootcheck</action>
+ </actions>
+ </listitem>
+
+ <listitem name="{@rb_recovery_btn=Recovery}">
+ <condition var1="tw_reboot_recovery" var2="1"/>
+ <actions>
+ <action function="set">tw_back=reboot</action>
+ <action function="set">tw_action=reboot</action>
+ <action function="set">tw_action_param=recovery</action>
+ <action function="set">tw_reboot_param=recovery</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>
+ </actions>
+ </listitem>
+
+ <listitem name="{@rb_bootloader_btn=Bootloader}">
+ <condition var1="tw_reboot_bootloader" var2="1"/>
+ <actions>
+ <action function="set">tw_back=reboot</action>
+ <action function="set">tw_action=reboot</action>
+ <action function="set">tw_action_param=bootloader</action>
+ <action function="set">tw_reboot_param=bootloader</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>
+ </actions>
+ </listitem>
+
+ <listitem name="{@rb_download_btn=Download}">
+ <condition var1="tw_download_mode" var2="1"/>
+ <actions>
+ <action function="set">tw_back=reboot</action>
+ <action function="set">tw_action=reboot</action>
+ <action function="set">tw_action_param=download</action>
+ <action function="set">tw_reboot_param=download</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>
+ </actions>
+ </listitem>
+
+
+ <listitem name="{@fastboot_button=Fastboot}">
+ <condition var1="tw_fastboot_mode" var2="1"/>
+ <actions>
+ <action function="set">tw_back=reboot</action>
+ <action function="set">tw_action=reboot</action>
+ <action function="set">tw_action_param=fastboot</action>
+ <action function="set">tw_reboot_param=fastboot</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>
+ </actions>
+ </listitem>
+
+ <listitem name="{@rb_edl_btn=Edl}">
+ <condition var1="tw_edl_mode" var2="1"/>
+ <actions>
+ <action function="set">tw_back=reboot</action>
+ <action function="set">tw_action=reboot</action>
+ <action function="set">tw_action_param=edl</action>
+ <action function="set">tw_reboot_param=edl</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>
+ </actions>
+ </button>
+ </listbox>
+
+ <text style="text_m">
+ <condition var1="tw_has_boot_slots" var2="1"/>
+ <placement x="%center_x%" y="%row14_y%" placement="5"/>
+ <text>{@current_boot_slot=Current Slot: %tw_active_slot%}</text>
+ </text>
+
<button style="main_button">
- <condition var1="tw_reboot_system" var2="1"/>
- <placement x="%col1_x_left%" y="%row2_y%"/>
- <text>{@rb_system_btn=System}</text>
+ <condition var1="tw_has_boot_slots" var2="1"/>
+ <placement x="%indent%" y="%row16_y%"/>
+ <text>{@boot_slot_a=Slot A}</text>
<actions>
<action function="set">tw_back=reboot</action>
- <action function="page">reboot_system_routine</action>
+ <action function="set">tw_action=setbootslot</action>
+ <action function="set">tw_action_param=A</action>
+ <action function="set">tw_has_action2=0</action>
+ <action function="set">tw_action_text1={@changing_boot_slot=Changing Boot Slot}</action>
+ <action function="set">tw_action_text2=</action>
+ <action function="set">tw_complete_text1={@changing_boot_slot_complete=Change Boot Slot Complete}</action>
+ <action function="page">action_page</action>
</actions>
</button>
<button style="main_button">
- <condition var1="tw_reboot_poweroff" var2="1"/>
- <placement x="%center_x%" y="%row2_y%"/>
- <text>{@rb_poweroff_btn=Power Off}</text>
+ <condition var1="tw_has_boot_slots" var2="1"/>
+ <placement x="%center_x%" y="%row16_y%"/>
+ <text>{@boot_slot_b=Slot B}</text>
<actions>
<action function="set">tw_back=reboot</action>
- <action function="set">tw_action=reboot</action>
- <action function="set">tw_action_param=poweroff</action>
- <action function="set">tw_reboot_param=poweroff</action>
+ <action function="set">tw_action=setbootslot</action>
+ <action function="set">tw_action_param=B</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_ospo=sure you wish to power off?}</action>
- <action function="set">tw_action_text1={@turning_off=Turning Off...}</action>
- <action function="set">tw_complete_text1={@turning_off=Turning Off...}</action>
- <action function="set">tw_slider_text={@swipe_power_off=Swipe to Power Off}</action>
- <action function="page">rebootcheck</action>
- </actions>
- </button>
-
- <button style="main_button">
- <condition var1="tw_reboot_recovery" var2="1"/>
- <placement x="%col1_x_left%" y="%row6a_y%"/>
- <text>{@rb_recovery_btn=Recovery}</text>
- <actions>
- <action function="set">tw_back=reboot</action>
- <action function="set">tw_action=reboot</action>
- <action function="set">tw_action_param=recovery</action>
- <action function="set">tw_reboot_param=recovery</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>
- </actions>
- </button>
-
- <button style="main_button">
- <condition var1="tw_reboot_bootloader" var2="1"/>
- <placement x="%center_x%" y="%row6a_y%"/>
- <text>{@rb_bootloader_btn=Bootloader}</text>
- <actions>
- <action function="set">tw_back=reboot</action>
- <action function="set">tw_action=reboot</action>
- <action function="set">tw_action_param=bootloader</action>
- <action function="set">tw_reboot_param=bootloader</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>
- </actions>
- </button>
-
- <button style="main_button">
- <condition var1="tw_download_mode" var2="1"/>
- <placement x="%col1_x_left%" y="%row11_y%"/>
- <text>{@rb_download_btn=Download}</text>
- <actions>
- <action function="set">tw_back=reboot</action>
- <action function="set">tw_action=reboot</action>
- <action function="set">tw_action_param=download</action>
- <action function="set">tw_reboot_param=download</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>
- </actions>
- </button>
-
- <button style="main_button">
- <condition var1="tw_edl_mode" var2="1"/>
- <placement x="%center_x%" y="%row11_y%"/>
- <text>{@rb_edl_btn=Edl}</text>
- <actions>
- <action function="set">tw_back=reboot</action>
- <action function="set">tw_action=reboot</action>
- <action function="set">tw_action_param=edl</action>
- <action function="set">tw_reboot_param=edl</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="set">tw_action_text1={@changing_boot_slot=Changing Boot Slot}</action>
+ <action function="set">tw_action_text2=</action>
+ <action function="set">tw_complete_text1={@changing_boot_slot_complete=Change Boot Slot Complete}</action>
+ <action function="page">action_page</action>
</actions>
</button>
@@ -4868,6 +5043,47 @@
<action function="screenshot" />
</object>
</page>
+
+ <page name="fastboot">
+ <template name="page"/>
+
+ <text style="text_l">
+ <placement x="%col1_x_header%" y="%row3_header_y%"/>
+ <text>{@fastboot_button=Fastboot}</text>
+ </text>
+
+ <template name="console"/>
+
+ <template name="progress_bar"/>
+
+ <button style="main_button_half_width">
+ <condition var1="tw_enable_fastboot" op="=" var2="1" />
+ <placement x="%col2_x_right%" y="%row15a_y%"/>
+ <text>{@enable_adb=Enable ADB}</text>
+ <actions>
+ <action function="enableadb"/>
+ <action function="set">tw_enable_adb=1</action>
+ <action function="set">tw_enable_fastboot=0</action>
+ </actions>
+ </button>
+
+ <button style="main_button_half_width">
+ <condition var1="tw_enable_adb" op="=" var2="1" />
+ <placement x="%col2_x_right%" y="%row15a_y%"/>
+ <text>{@enable_fastboot=Enable Fastboot}</text>
+ <actions>
+ <action function="enablefastboot"/>
+ <action function="set">tw_enable_fastboot=1</action>
+ <action function="set">tw_enable_adb=0</action>
+ </actions>
+ </button>
+
+ <button style="main_button_half_width">
+ <placement x="%col3_x_right%" y="%row15a_y%"/>
+ <text>{@reboot_btn=Reboot}</text>
+ <action function="page">fastbootreboot</action>
+ </button>
+ </page>
<page name="sideload">
<template name="page"/>
diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index 7982a3b..fa8058a 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -727,5 +727,9 @@
<string name="ozip_decrypt_decryption">Starting Ozip Decryption...</string>
<string name="ozip_decrypt_finish">Ozip Decryption Finished!</string>
<string name="fbe_wipe_msg">WARNING: {1} wiped. FBE device should be booted into Android and not Recovery to set initial FBE policy after wipe.</string>
+ <string name="fastboot_button">Fastboot</string>
+ <string name="enable_adb">Enable ADB</string>
+ <string name="enable_fastboot">Enable Fastboot</string>
+ <string name="fastboot_console_msg">Entered Fastboot mode...</string>
</resources>
</language>
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index 31aef46..3960faf 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -2795,6 +2795,134 @@
</action>
</page>
+ <page name="fastbootreboot">
+ <template name="page"/>
+
+ <text style="text_l">
+ <placement x="%col1_x_header%" y="%row3_header_y%"/>
+ <text>{@reboot_hdr=Reboot}</text>
+ </text>
+
+ <listbox style="advanced_listbox">
+ <placement x="%indent%" y="%row2a_y%" w="%content_width%" h="%listbox_advanced_height%"/>
+
+ <listitem name="{@rb_system_btn=System}">
+ <condition var1="tw_reboot_system" var2="1"/>
+ <actions>
+ <action function="set">tw_back=fastbootreboot</action>
+ <action function="set">tw_action=reboot</action>
+ <action function="set">tw_action_param=system</action>
+ <action function="set">tw_reboot_param=system</action>
+ <action function="set">tw_has_action2=0</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">confirm_action</action>
+ </actions>
+ </listitem>
+
+ <listitem name="{@rb_poweroff_btn=Power Off}">
+ <condition var1="tw_reboot_poweroff" var2="1"/>
+ <actions>
+ <action function="set">tw_back=fastbootreboot</action>
+ <action function="set">tw_action=reboot</action>
+ <action function="set">tw_action_param=poweroff</action>
+ <action function="set">tw_reboot_param=poweroff</action>
+ <action function="set">tw_has_action2=0</action>
+ <action function="set">tw_action_text1={@turning_off=Turning Off...}</action>
+ <action function="set">tw_complete_text1={@turning_off=Turning Off...}</action>
+ <action function="set">tw_slider_text={@swipe_power_off=Swipe to Power Off}</action>
+ <action function="page">confirm_action</action>
+ </actions>
+ </listitem>
+
+ <listitem name="{@rb_recovery_btn=Recovery}">
+ <condition var1="tw_reboot_recovery" var2="1"/>
+ <actions>
+ <action function="set">tw_back=fastbootreboot</action>
+ <action function="set">tw_action=reboot</action>
+ <action function="set">tw_action_param=recovery</action>
+ <action function="set">tw_reboot_param=recovery</action>
+ <action function="set">tw_has_action2=0</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">confirm_action</action>
+ </actions>
+ </listitem>
+
+ <listitem name="{@rb_bootloader_btn=Bootloader}">
+ <condition var1="tw_reboot_bootloader" var2="1"/>
+ <actions>
+ <action function="set">tw_back=fastbootreboot</action>
+ <action function="set">tw_action=reboot</action>
+ <action function="set">tw_action_param=bootloader</action>
+ <action function="set">tw_reboot_param=bootloader</action>
+ <action function="set">tw_has_action2=0</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">confirm_action</action>
+ </actions>
+ </listitem>
+
+ <listitem name="{@rb_download_btn=Download}">
+ <condition var1="tw_download_mode" var2="1"/>
+ <actions>
+ <action function="set">tw_back=fastbootreboot</action>
+ <action function="set">tw_action=reboot</action>
+ <action function="set">tw_action_param=download</action>
+ <action function="set">tw_reboot_param=download</action>
+ <action function="set">tw_has_action2=0</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">confirm_action</action>
+ </actions>
+ </listitem>
+
+ <listitem name="{@fastboot_button=Fastboot}">
+ <condition var1="tw_fastboot_mode" var2="1"/>
+ <actions>
+ <action function="set">tw_back=fastbootreboot</action>
+ <action function="set">tw_action=reboot</action>
+ <action function="set">tw_action_param=fastboot</action>
+ <action function="set">tw_reboot_param=fastboot</action>
+ <action function="set">tw_has_action2=0</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">confirm_action</action>
+ </actions>
+ </listitem>
+
+ <listitem name="{@rb_edl_btn=Edl}">
+ <condition var1="tw_edl_mode" var2="1"/>
+ <actions>
+ <action function="set">tw_back=fastbootreboot</action>
+ <action function="set">tw_action=reboot</action>
+ <action function="set">tw_action_param=edl</action>
+ <action function="set">tw_reboot_param=edl</action>
+ <action function="set">tw_has_action2=0</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">confirm_action</action>
+ </actions>
+ </listitem>
+ </listbox>
+
+ <action>
+ <touch key="home"/>
+ <action function="page">fastboot</action>
+ </action>
+
+ <action>
+ <touch key="back"/>
+ <action function="page">fastboot</action>
+ </action>
+ </page>
+
<page name="reboot">
<template name="page"/>
@@ -2803,118 +2931,127 @@
<text>{@reboot_hdr=Reboot}</text>
</text>
- <button style="main_button">
- <condition var1="tw_reboot_system" var2="1"/>
- <placement x="%indent%" y="%row2a_y%"/>
- <text>{@rb_system_btn=System}</text>
- <actions>
- <action function="set">tw_back=reboot</action>
- <action function="page">reboot_system_routine</action>
- </actions>
- </button>
+ <listbox style="advanced_listbox">
+ <placement x="%indent%" y="%row2a_y%" w="%content_width%" h="%listbox_advanced_height%"/>
- <button style="main_button">
- <condition var1="tw_reboot_poweroff" var2="1"/>
- <placement x="%center_x%" y="%row2a_y%"/>
- <text>{@rb_poweroff_btn=Power Off}</text>
- <actions>
- <action function="set">tw_back=reboot</action>
- <action function="set">tw_action=reboot</action>
- <action function="set">tw_action_param=poweroff</action>
- <action function="set">tw_reboot_param=poweroff</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_ospo=sure you wish to power off?}</action>
- <action function="set">tw_action_text1={@turning_off=Turning Off...}</action>
- <action function="set">tw_complete_text1={@turning_off=Turning Off...}</action>
- <action function="set">tw_slider_text={@swipe_power_off=Swipe to Power Off}</action>
- <action function="page">rebootcheck</action>
- </actions>
- </button>
+ <listitem name="{@rb_system_btn=System}">
+ <condition var1="tw_reboot_system" var2="1"/>
+ <actions>
+ <action function="set">tw_back=reboot</action>
+ <action function="page">reboot_system_routine</action>
+ </actions>
+ </listitem>
- <button style="main_button">
- <condition var1="tw_reboot_recovery" var2="1"/>
- <placement x="%indent%" y="%row8_y%"/>
- <text>{@rb_recovery_btn=Recovery}</text>
- <actions>
- <action function="set">tw_back=reboot</action>
- <action function="set">tw_action=reboot</action>
- <action function="set">tw_action_param=recovery</action>
- <action function="set">tw_reboot_param=recovery</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>
- </actions>
- </button>
+ <listitem name="{@rb_poweroff_btn=Power Off}">
+ <condition var1="tw_reboot_poweroff" var2="1"/>
+ <actions>
+ <action function="set">tw_back=reboot</action>
+ <action function="set">tw_action=reboot</action>
+ <action function="set">tw_action_param=poweroff</action>
+ <action function="set">tw_reboot_param=poweroff</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_ospo=sure you wish to power off?}</action>
+ <action function="set">tw_action_text1={@turning_off=Turning Off...}</action>
+ <action function="set">tw_complete_text1={@turning_off=Turning Off...}</action>
+ <action function="set">tw_slider_text={@swipe_power_off=Swipe to Power Off}</action>
+ <action function="page">rebootcheck</action>
+ </actions>
+ </listitem>
- <button style="main_button">
- <condition var1="tw_reboot_bootloader" var2="1"/>
- <placement x="%center_x%" y="%row8_y%"/>
- <text>{@rb_bootloader_btn=Bootloader}</text>
- <actions>
- <action function="set">tw_back=reboot</action>
- <action function="set">tw_action=reboot</action>
- <action function="set">tw_action_param=bootloader</action>
- <action function="set">tw_reboot_param=bootloader</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>
- </actions>
- </button>
+ <listitem name="{@rb_recovery_btn=Recovery}">
+ <condition var1="tw_reboot_recovery" var2="1"/>
+ <actions>
+ <action function="set">tw_back=reboot</action>
+ <action function="set">tw_action=reboot</action>
+ <action function="set">tw_action_param=recovery</action>
+ <action function="set">tw_reboot_param=recovery</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>
+ </actions>
+ </listitem>
- <button style="main_button">
- <condition var1="tw_download_mode" var2="1"/>
- <placement x="%indent%" y="%row13a_y%"/>
- <text>{@rb_download_btn=Download}</text>
- <actions>
- <action function="set">tw_back=reboot</action>
- <action function="set">tw_action=reboot</action>
- <action function="set">tw_action_param=download</action>
- <action function="set">tw_reboot_param=download</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>
- </actions>
- </button>
+ <listitem name="{@rb_bootloader_btn=Bootloader}">
+ <condition var1="tw_reboot_bootloader" var2="1"/>
+ <actions>
+ <action function="set">tw_back=reboot</action>
+ <action function="set">tw_action=reboot</action>
+ <action function="set">tw_action_param=bootloader</action>
+ <action function="set">tw_reboot_param=bootloader</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>
+ </actions>
+ </listitem>
- <button style="main_button">
- <condition var1="tw_edl_mode" var2="1"/>
- <placement x="%center_x%" y="%row13a_y%"/>
- <text>{@rb_edl_btn=Edl}</text>
- <actions>
- <action function="set">tw_back=reboot</action>
- <action function="set">tw_action=reboot</action>
- <action function="set">tw_action_param=edl</action>
- <action function="set">tw_reboot_param=edl</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>
- </actions>
- </button>
+ <listitem name="{@rb_download_btn=Download}">
+ <condition var1="tw_download_mode" var2="1"/>
+ <actions>
+ <action function="set">tw_back=reboot</action>
+ <action function="set">tw_action=reboot</action>
+ <action function="set">tw_action_param=download</action>
+ <action function="set">tw_reboot_param=download</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>
+ </actions>
+ </listitem>
+
+ <listitem name="{@fastboot_button=Fastboot}">
+ <condition var1="tw_fastboot_mode" var2="1"/>
+ <actions>
+ <action function="set">tw_back=reboot</action>
+ <action function="set">tw_action=reboot</action>
+ <action function="set">tw_action_param=fastboot</action>
+ <action function="set">tw_reboot_param=fastboot</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>
+ </actions>
+ </listitem>
+
+ <listitem name="{@rb_edl_btn=Edl}">
+ <condition var1="tw_edl_mode" var2="1"/>
+ <actions>
+ <action function="set">tw_back=reboot</action>
+ <action function="set">tw_action=reboot</action>
+ <action function="set">tw_action_param=edl</action>
+ <action function="set">tw_reboot_param=edl</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>
+ </actions>
+ </button>
+ </listbox>
<text style="text_m">
<condition var1="tw_has_boot_slots" var2="1"/>
- <placement x="%center_x%" y="%row18_y%" placement="5"/>
+ <placement x="%center_x%" y="%row15_y%" placement="5"/>
<text>{@current_boot_slot=Current Slot: %tw_active_slot%}</text>
</text>
- <button style="main_button">
+ <button style="main_button_half_height">
<condition var1="tw_has_boot_slots" var2="1"/>
<placement x="%indent%" y="%row19_y%"/>
<text>{@boot_slot_a=Slot A}</text>
@@ -2930,7 +3067,7 @@
</actions>
</button>
- <button style="main_button">
+ <button style="main_button_half_height">
<condition var1="tw_has_boot_slots" var2="1"/>
<placement x="%center_x%" y="%row19_y%"/>
<text>{@boot_slot_b=Slot B}</text>
@@ -4851,6 +4988,47 @@
</action>
</page>
+ <page name="fastboot">
+ <template name="page"/>
+
+ <text style="text_l">
+ <placement x="%col1_x_header%" y="%row3_header_y%"/>
+ <text>{@fastboot_button=Fastboot}</text>
+ </text>
+
+ <template name="console"/>
+
+ <template name="progress_bar"/>
+
+ <button style="main_button_half_height">
+ <condition var1="tw_enable_fastboot" op="=" var2="1" />
+ <placement x="%indent%" y="%row21a_y%"/>
+ <text>{@enable_adb=Enable ADB}</text>
+ <actions>
+ <action function="enableadb"/>
+ <action function="set">tw_enable_adb=1</action>
+ <action function="set">tw_enable_fastboot=0</action>
+ </actions>
+ </button>
+
+ <button style="main_button_half_height">
+ <condition var1="tw_enable_adb" op="=" var2="1" />
+ <placement x="%indent%" y="%row21a_y%"/>
+ <text>{@enable_fastboot=Enable Fastboot}</text>
+ <actions>
+ <action function="enablefastboot"/>
+ <action function="set">tw_enable_fastboot=1</action>
+ <action function="set">tw_enable_adb=0</action>
+ </actions>
+ </button>
+
+ <button style="main_button_half_height">
+ <placement x="%center_x%" y="%row21a_y%"/>
+ <text>{@reboot_btn=Reboot}</text>
+ <action function="page">fastbootreboot</action>
+ </button>
+ </page>
+
<page name="sideload">
<template name="page"/>
diff --git a/gui/theme/landscape_hdpi/ui.xml b/gui/theme/landscape_hdpi/ui.xml
index 6e746a0..45aa82b 100755
--- a/gui/theme/landscape_hdpi/ui.xml
+++ b/gui/theme/landscape_hdpi/ui.xml
@@ -6,7 +6,7 @@
<title>Backup Naowz</title>
<description>Default basic theme</description>
<preview>preview.png</preview>
- <themeversion>3</themeversion>
+ <themeversion>4</themeversion>
</details>
<include>
@@ -198,6 +198,7 @@
<variable name="partitionlist_backup_height" value="528"/>
<variable name="listbox_timezone_height" value="768"/>
<variable name="listbox_settings_height" value="648"/>
+ <variable name="listbox_advanced_height" value="700"/>
<variable name="fastscroll_w" value="18"/>
<variable name="fastscroll_linew" value="2"/>
<variable name="fastscroll_rectw" value="18"/>
diff --git a/gui/theme/landscape_mdpi/ui.xml b/gui/theme/landscape_mdpi/ui.xml
index 24458ec..8b7b6d3 100755
--- a/gui/theme/landscape_mdpi/ui.xml
+++ b/gui/theme/landscape_mdpi/ui.xml
@@ -6,7 +6,7 @@
<title>Backup Naowz</title>
<description>Default basic theme</description>
<preview>preview.png</preview>
- <themeversion>3</themeversion>
+ <themeversion>4</themeversion>
</details>
<include>
@@ -198,6 +198,7 @@
<variable name="partitionlist_backup_height" value="198"/>
<variable name="listbox_timezone_height" value="306"/>
<variable name="listbox_settings_height" value="243"/>
+ <variable name="listbox_advanced_height" value="300"/>
<variable name="fastscroll_w" value="7"/>
<variable name="fastscroll_linew" value="1"/>
<variable name="fastscroll_rectw" value="7"/>
diff --git a/gui/theme/portrait_hdpi/ui.xml b/gui/theme/portrait_hdpi/ui.xml
old mode 100644
new mode 100755
index f9ce5b0..abb1960
--- a/gui/theme/portrait_hdpi/ui.xml
+++ b/gui/theme/portrait_hdpi/ui.xml
@@ -6,7 +6,7 @@
<title>Backup Naowz</title>
<description>Default basic theme</description>
<preview>preview.png</preview>
- <themeversion>3</themeversion>
+ <themeversion>4</themeversion>
</details>
<include>
diff --git a/gui/theme/portrait_mdpi/ui.xml b/gui/theme/portrait_mdpi/ui.xml
index 8b91641..3de99ce 100755
--- a/gui/theme/portrait_mdpi/ui.xml
+++ b/gui/theme/portrait_mdpi/ui.xml
@@ -6,7 +6,7 @@
<title>Backup Naowz</title>
<description>Default basic theme</description>
<preview>preview.png</preview>
- <themeversion>3</themeversion>
+ <themeversion>4</themeversion>
</details>
<include>