summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDees_Troy <dees_troy@teamw.in>2012-09-24 17:15:49 +0200
committerDees_Troy <dees_troy@teamw.in>2012-09-24 17:15:57 +0200
commit2691f9d7f845d3c424776059514e772782aa9f6b (patch)
tree5ee70eb51afae4a5a826cd360ad6805491126306
parentFix 320x480 theme (diff)
downloadandroid_bootable_recovery-2691f9d7f845d3c424776059514e772782aa9f6b.tar
android_bootable_recovery-2691f9d7f845d3c424776059514e772782aa9f6b.tar.gz
android_bootable_recovery-2691f9d7f845d3c424776059514e772782aa9f6b.tar.bz2
android_bootable_recovery-2691f9d7f845d3c424776059514e772782aa9f6b.tar.lz
android_bootable_recovery-2691f9d7f845d3c424776059514e772782aa9f6b.tar.xz
android_bootable_recovery-2691f9d7f845d3c424776059514e772782aa9f6b.tar.zst
android_bootable_recovery-2691f9d7f845d3c424776059514e772782aa9f6b.zip
Diffstat (limited to '')
-rw-r--r--adb_install.cpp2
-rwxr-xr-xgui/devices/1024x600/res/ui.xml37
-rw-r--r--gui/devices/1024x768/res/ui.xml37
-rw-r--r--gui/devices/1280x800/res/ui.xml37
-rw-r--r--gui/devices/1920x1200/res/ui.xml37
-rwxr-xr-xgui/devices/800x480/res/ui.xml41
-rw-r--r--partition.cpp1
7 files changed, 189 insertions, 3 deletions
diff --git a/adb_install.cpp b/adb_install.cpp
index 63eb967e1..f227bc024 100644
--- a/adb_install.cpp
+++ b/adb_install.cpp
@@ -107,7 +107,7 @@ apply_from_adb(RecoveryUI* ui_, int* wipe_cache, const char* install_file) {
if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
ui->Print("status %d\n", WEXITSTATUS(status));
}
-
+ DataManager_SetIntValue("tw_has_cancel", 0); // Remove cancel button from gui now that the zip install is going to start
set_usb_driver(false);
maybe_restart_adbd();
diff --git a/gui/devices/1024x600/res/ui.xml b/gui/devices/1024x600/res/ui.xml
index cc9bcb120..bb1b0daa2 100755
--- a/gui/devices/1024x600/res/ui.xml
+++ b/gui/devices/1024x600/res/ui.xml
@@ -819,6 +819,9 @@
<action function="set">tw_has_action2=0</action>
<action function="set">tw_action2=</action>
<action function="set">tw_action2_param=</action>
+ <action function="set">tw_has_cancel=0</action>
+ <action function="set">tw_cancel_action=</action>
+ <action function="set">tw_cancel_param=</action>
<action function="page">%tw_clear_destination%</action>
</object>
</page>
@@ -901,6 +904,15 @@
<object type="template" name="action_page_console" />
+ <object type="button">
+ <condition var1="tw_has_cancel" var2="1" />
+ <placement x="%col4_x%" y="%slider_y%" />
+ <font resource="font" color="%button_text_color%" />
+ <text>Cancel</text>
+ <image resource="main_button" />
+ <action function="%tw_cancel_action%">%tw_cancel_param%</action>
+ </object>
+
<object type="template" name="progress_bar" />
<object type="action">
@@ -2546,6 +2558,23 @@
</object>
<object type="button">
+ <placement x="%col4_x%" y="%row1_y%" />
+ <font resource="font" color="%button_text_color%" />
+ <text>ADB Sideload</text>
+ <image resource="main_button" />
+ <actions>
+ <action function="set">tw_back=advanced</action>
+ <action function="set">tw_action=adbsideload</action>
+ <action function="set">tw_action_text1=ADB Sideload</action>
+ <action function="set">tw_action_text2=Usage: adb sideload filename.zip</action>
+ <action function="set">tw_complete_text1=ADB Sideload Complete</action>
+ <action function="set">tw_has_cancel=1</action>
+ <action function="set">tw_cancel_action=adbsideloadcancel</action>
+ <action function="page">action_page</action>
+ </actions>
+ </object>
+
+ <object type="button">
<condition var1="tw_allow_partition_sdcard" var2="1" />
<placement x="%col1_x%" y="%row2_y%" />
<font resource="font" color="%button_text_color%" />
@@ -2563,6 +2592,14 @@
</object>
<object type="button">
+ <placement x="%col3_x%" y="%row2_y%" />
+ <font resource="font" color="%button_text_color%" />
+ <text>Reload Theme</text>
+ <image resource="main_button" />
+ <action function="reload"></action>
+ </object>
+
+ <object type="button">
<condition var1="tw_show_dumlock" var2="1" />
<placement x="%col4_x%" y="%row2_y%" />
<font resource="font" color="%button_text_color%" />
diff --git a/gui/devices/1024x768/res/ui.xml b/gui/devices/1024x768/res/ui.xml
index dc4ef1485..2f1eec1c8 100644
--- a/gui/devices/1024x768/res/ui.xml
+++ b/gui/devices/1024x768/res/ui.xml
@@ -819,6 +819,9 @@
<action function="set">tw_has_action2=0</action>
<action function="set">tw_action2=</action>
<action function="set">tw_action2_param=</action>
+ <action function="set">tw_has_cancel=0</action>
+ <action function="set">tw_cancel_action=</action>
+ <action function="set">tw_cancel_param=</action>
<action function="page">%tw_clear_destination%</action>
</object>
</page>
@@ -901,6 +904,15 @@
<object type="template" name="action_page_console" />
+ <object type="button">
+ <condition var1="tw_has_cancel" var2="1" />
+ <placement x="%col4_x%" y="%slider_y%" />
+ <font resource="font" color="%button_text_color%" />
+ <text>Cancel</text>
+ <image resource="main_button" />
+ <action function="%tw_cancel_action%">%tw_cancel_param%</action>
+ </object>
+
<object type="template" name="progress_bar" />
<object type="action">
@@ -2546,6 +2558,23 @@
</object>
<object type="button">
+ <placement x="%col4_x%" y="%row1_y%" />
+ <font resource="font" color="%button_text_color%" />
+ <text>ADB Sideload</text>
+ <image resource="main_button" />
+ <actions>
+ <action function="set">tw_back=advanced</action>
+ <action function="set">tw_action=adbsideload</action>
+ <action function="set">tw_action_text1=ADB Sideload</action>
+ <action function="set">tw_action_text2=Usage: adb sideload filename.zip</action>
+ <action function="set">tw_complete_text1=ADB Sideload Complete</action>
+ <action function="set">tw_has_cancel=1</action>
+ <action function="set">tw_cancel_action=adbsideloadcancel</action>
+ <action function="page">action_page</action>
+ </actions>
+ </object>
+
+ <object type="button">
<condition var1="tw_allow_partition_sdcard" var2="1" />
<placement x="%col1_x%" y="%row2_y%" />
<font resource="font" color="%button_text_color%" />
@@ -2563,6 +2592,14 @@
</object>
<object type="button">
+ <placement x="%col3_x%" y="%row2_y%" />
+ <font resource="font" color="%button_text_color%" />
+ <text>Reload Theme</text>
+ <image resource="main_button" />
+ <action function="reload"></action>
+ </object>
+
+ <object type="button">
<condition var1="tw_show_dumlock" var2="1" />
<placement x="%col4_x%" y="%row2_y%" />
<font resource="font" color="%button_text_color%" />
diff --git a/gui/devices/1280x800/res/ui.xml b/gui/devices/1280x800/res/ui.xml
index a11e78eb3..cfe933598 100644
--- a/gui/devices/1280x800/res/ui.xml
+++ b/gui/devices/1280x800/res/ui.xml
@@ -819,6 +819,9 @@
<action function="set">tw_has_action2=0</action>
<action function="set">tw_action2=</action>
<action function="set">tw_action2_param=</action>
+ <action function="set">tw_has_cancel=0</action>
+ <action function="set">tw_cancel_action=</action>
+ <action function="set">tw_cancel_param=</action>
<action function="page">%tw_clear_destination%</action>
</object>
</page>
@@ -901,6 +904,15 @@
<object type="template" name="action_page_console" />
+ <object type="button">
+ <condition var1="tw_has_cancel" var2="1" />
+ <placement x="%col4_x%" y="%slider_y%" />
+ <font resource="font" color="%button_text_color%" />
+ <text>Cancel</text>
+ <image resource="main_button" />
+ <action function="%tw_cancel_action%">%tw_cancel_param%</action>
+ </object>
+
<object type="template" name="progress_bar" />
<object type="action">
@@ -2546,6 +2558,23 @@
</object>
<object type="button">
+ <placement x="%col4_x%" y="%row1_y%" />
+ <font resource="font" color="%button_text_color%" />
+ <text>ADB Sideload</text>
+ <image resource="main_button" />
+ <actions>
+ <action function="set">tw_back=advanced</action>
+ <action function="set">tw_action=adbsideload</action>
+ <action function="set">tw_action_text1=ADB Sideload</action>
+ <action function="set">tw_action_text2=Usage: adb sideload filename.zip</action>
+ <action function="set">tw_complete_text1=ADB Sideload Complete</action>
+ <action function="set">tw_has_cancel=1</action>
+ <action function="set">tw_cancel_action=adbsideloadcancel</action>
+ <action function="page">action_page</action>
+ </actions>
+ </object>
+
+ <object type="button">
<condition var1="tw_allow_partition_sdcard" var2="1" />
<placement x="%col1_x%" y="%row2_y%" />
<font resource="font" color="%button_text_color%" />
@@ -2563,6 +2592,14 @@
</object>
<object type="button">
+ <placement x="%col3_x%" y="%row2_y%" />
+ <font resource="font" color="%button_text_color%" />
+ <text>Reload Theme</text>
+ <image resource="main_button" />
+ <action function="reload"></action>
+ </object>
+
+ <object type="button">
<condition var1="tw_show_dumlock" var2="1" />
<placement x="%col4_x%" y="%row2_y%" />
<font resource="font" color="%button_text_color%" />
diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml
index 21c3a28a1..2da3f7d07 100644
--- a/gui/devices/1920x1200/res/ui.xml
+++ b/gui/devices/1920x1200/res/ui.xml
@@ -819,6 +819,9 @@
<action function="set">tw_has_action2=0</action>
<action function="set">tw_action2=</action>
<action function="set">tw_action2_param=</action>
+ <action function="set">tw_has_cancel=0</action>
+ <action function="set">tw_cancel_action=</action>
+ <action function="set">tw_cancel_param=</action>
<action function="page">%tw_clear_destination%</action>
</object>
</page>
@@ -901,6 +904,15 @@
<object type="template" name="action_page_console" />
+ <object type="button">
+ <condition var1="tw_has_cancel" var2="1" />
+ <placement x="%col4_x%" y="%slider_y%" />
+ <font resource="font" color="%button_text_color%" />
+ <text>Cancel</text>
+ <image resource="main_button" />
+ <action function="%tw_cancel_action%">%tw_cancel_param%</action>
+ </object>
+
<object type="template" name="progress_bar" />
<object type="action">
@@ -2546,6 +2558,23 @@
</object>
<object type="button">
+ <placement x="%col4_x%" y="%row1_y%" />
+ <font resource="font" color="%button_text_color%" />
+ <text>ADB Sideload</text>
+ <image resource="main_button" />
+ <actions>
+ <action function="set">tw_back=advanced</action>
+ <action function="set">tw_action=adbsideload</action>
+ <action function="set">tw_action_text1=ADB Sideload</action>
+ <action function="set">tw_action_text2=Usage: adb sideload filename.zip</action>
+ <action function="set">tw_complete_text1=ADB Sideload Complete</action>
+ <action function="set">tw_has_cancel=1</action>
+ <action function="set">tw_cancel_action=adbsideloadcancel</action>
+ <action function="page">action_page</action>
+ </actions>
+ </object>
+
+ <object type="button">
<condition var1="tw_allow_partition_sdcard" var2="1" />
<placement x="%col1_x%" y="%row2_y%" />
<font resource="font" color="%button_text_color%" />
@@ -2563,6 +2592,14 @@
</object>
<object type="button">
+ <placement x="%col3_x%" y="%row2_y%" />
+ <font resource="font" color="%button_text_color%" />
+ <text>Reload Theme</text>
+ <image resource="main_button" />
+ <action function="reload"></action>
+ </object>
+
+ <object type="button">
<condition var1="tw_show_dumlock" var2="1" />
<placement x="%col4_x%" y="%row2_y%" />
<font resource="font" color="%button_text_color%" />
diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml
index 07d331765..798b08db4 100755
--- a/gui/devices/800x480/res/ui.xml
+++ b/gui/devices/800x480/res/ui.xml
@@ -55,7 +55,7 @@
<variable name="screen_width" value="800" />
<variable name="screen_height" value="480" />
<variable name="col_progressbar_x" value="300" />
- <variable name="row_progressbar_y" value="380" />
+ <variable name="row_progressbar_y" value="440" />
<variable name="col1_medium_x" value="120" />
<variable name="col2_medium_x" value="250" />
<variable name="col3_medium_x" value="380" />
@@ -342,7 +342,7 @@
<template name="action_page_console">
<object type="console">
- <placement x="%console_x%" y="200" w="%console_width%" h="230" />
+ <placement x="%console_x%" y="160" w="%console_width%" h="230" />
<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
<font resource="fixed" />
</object>
@@ -819,6 +819,9 @@
<action function="set">tw_has_action2=0</action>
<action function="set">tw_action2=</action>
<action function="set">tw_action2_param=</action>
+ <action function="set">tw_has_cancel=0</action>
+ <action function="set">tw_cancel_action=</action>
+ <action function="set">tw_cancel_param=</action>
<action function="page">%tw_clear_destination%</action>
</object>
</page>
@@ -901,6 +904,15 @@
<object type="template" name="action_page_console" />
+ <object type="button">
+ <condition var1="tw_has_cancel" var2="1" />
+ <placement x="%col4_x%" y="%slider_y%" />
+ <font resource="font" color="%button_text_color%" />
+ <text>Cancel</text>
+ <image resource="main_button" />
+ <action function="%tw_cancel_action%">%tw_cancel_param%</action>
+ </object>
+
<object type="template" name="progress_bar" />
<object type="action">
@@ -2546,6 +2558,23 @@
</object>
<object type="button">
+ <placement x="%col4_x%" y="%row1_y%" />
+ <font resource="font" color="%button_text_color%" />
+ <text>ADB Sideload</text>
+ <image resource="main_button" />
+ <actions>
+ <action function="set">tw_back=advanced</action>
+ <action function="set">tw_action=adbsideload</action>
+ <action function="set">tw_action_text1=ADB Sideload</action>
+ <action function="set">tw_action_text2=Usage: adb sideload filename.zip</action>
+ <action function="set">tw_complete_text1=ADB Sideload Complete</action>
+ <action function="set">tw_has_cancel=1</action>
+ <action function="set">tw_cancel_action=adbsideloadcancel</action>
+ <action function="page">action_page</action>
+ </actions>
+ </object>
+
+ <object type="button">
<condition var1="tw_allow_partition_sdcard" var2="1" />
<placement x="%col1_x%" y="%row2_y%" />
<font resource="font" color="%button_text_color%" />
@@ -2563,6 +2592,14 @@
</object>
<object type="button">
+ <placement x="%col3_x%" y="%row2_y%" />
+ <font resource="font" color="%button_text_color%" />
+ <text>Reload Theme</text>
+ <image resource="main_button" />
+ <action function="reload"></action>
+ </object>
+
+ <object type="button">
<condition var1="tw_show_dumlock" var2="1" />
<placement x="%col4_x%" y="%row2_y%" />
<font resource="font" color="%button_text_color%" />
diff --git a/partition.cpp b/partition.cpp
index bbcb48c70..42a44812c 100644
--- a/partition.cpp
+++ b/partition.cpp
@@ -51,6 +51,7 @@ TWPartition::TWPartition(void) {
Wipe_During_Factory_Reset = false;
Wipe_Available_in_GUI = false;
Is_SubPartition = false;
+ Has_SubPartition = false;
SubPartition_Of = "";
Symlink_Path = "";
Symlink_Mount_Point = "";
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 19:27:33 +0100