diff options
Diffstat (limited to 'gui/devices/2560x1600')
-rw-r--r-- | gui/devices/2560x1600/res/images/exclamation400.png | bin | 37149 -> 0 bytes | |||
-rw-r--r-- | gui/devices/2560x1600/res/ui.xml | 979 |
2 files changed, 302 insertions, 677 deletions
diff --git a/gui/devices/2560x1600/res/images/exclamation400.png b/gui/devices/2560x1600/res/images/exclamation400.png Binary files differdeleted file mode 100644 index 408193277..000000000 --- a/gui/devices/2560x1600/res/images/exclamation400.png +++ /dev/null diff --git a/gui/devices/2560x1600/res/ui.xml b/gui/devices/2560x1600/res/ui.xml index 96170b59f..7c46a9944 100644 --- a/gui/devices/2560x1600/res/ui.xml +++ b/gui/devices/2560x1600/res/ui.xml @@ -41,7 +41,6 @@ <resource name="keyboard2" type="image" filename="keyboard2" /> <resource name="keyboard3" type="image" filename="keyboard3" /> <resource name="keyboard4" type="image" filename="keyboard4" /> - <resource name="exclamation" type="image" filename="exclamation400" /> </resources> <variables> @@ -141,7 +140,7 @@ <variable name="fileselector_folderonly_width" value="1200" /> <variable name="fileselector_file_x" value="1000" /> <variable name="fileselector_file_width" value="1500" /> - <variable name="fileselector_install_y" value="260" /> + <variable name="fileselector_install_y" value="290" /> <variable name="fileselector_install_height" value="1100" /> <variable name="fileselector_header_background" value="#202020" /> <variable name="fileselector_header_textcolor" value="#AAAAAA" /> @@ -180,8 +179,24 @@ <variable name="terminal_text_y" value="837" /> <variable name="terminal_button_y" value="815" /> <variable name="terminal_input_width" value="2100" /> - <variable name="exclamation_x" value="1014" /> - <variable name="exclamation_y" value="320" /> + <variable name="button_fill_color" value="#303030" /> + <variable name="button_fill_full_width" value="1280" /> + <variable name="button_fill_main_width" value="1200" /> + <variable name="button_fill_main_height" value="320" /> + <variable name="button_fill_half_height" value="160" /> + <variable name="button_fill_quarter_height" value="80" /> + <variable name="button_full_center_x" value="640" /> + <variable name="backup_list_x" value="50" /> + <variable name="backup_list_y" value="210" /> + <variable name="backup_list_width" value="1200" /> + <variable name="backup_list_height" value="880" /> + <variable name="backup_storage_y" value="540" /> + <variable name="restore_list_y" value="280" /> + <variable name="restore_list_height" value="800" /> + <variable name="mount_list_height" value="1200" /> + <variable name="mount_storage_row" value="1100" /> + <variable name="wipe_list_height" value="1100" /> + <variable name="wipe_button_y" value="500" /> </variables> <templates> @@ -507,51 +522,15 @@ </object> <object type="button"> - <placement x="%col2_x%" y="%zipstorage_text_y%" /> - <font resource="font" color="%text_color%" /> - <conditions> - <condition var1="tw_has_dual_storage" var2="1" /> - <condition var1="tw_use_external_storage" var2="1" /> - </conditions> - <text>Using external SD</text> - <image resource="radio_true" /> - <action function="togglestorage">external</action> - </object> - - <object type="button"> - <placement x="%col2_x%" y="%zipstorage_text_y%" /> - <font resource="font" color="%text_color%" /> - <conditions> - <condition var1="tw_has_dual_storage" var2="1" /> - <condition var1="tw_use_external_storage" var2="0" /> - </conditions> - <text>Using external SD</text> - <image resource="radio_false" /> - <action function="togglestorage">external</action> - </object> - - <object type="button"> - <placement x="%col3_x%" y="%zipstorage_text_y%" /> - <font resource="font" color="%text_color%" /> - <conditions> - <condition var1="tw_has_dual_storage" var2="1" /> - <condition var1="tw_use_external_storage" var2="1" /> - </conditions> - <text>Using internal storage</text> - <image resource="radio_false" /> - <action function="togglestorage">internal</action> - </object> - - <object type="button"> - <placement x="%col3_x%" y="%zipstorage_text_y%" /> - <font resource="font" color="%text_color%" /> - <conditions> - <condition var1="tw_has_dual_storage" var2="1" /> - <condition var1="tw_use_external_storage" var2="0" /> - </conditions> - <text>Using internal storage</text> - <image resource="radio_true" /> - <action function="togglestorage">internal</action> + <highlight color="%highlight_color%" /> + <fill color="%button_fill_color%" /> + <placement x="%button_full_center_x%" y="%zipstorage_text_y%" w="%button_fill_full_width%" h="%button_fill_quarter_height%" /> + <font resource="font" color="%button_text_color%" /> + <text>Storage: %tw_storage_display_name% (%tw_storage_free_size% MB)</text> + <actions> + <action function="set">tw_back=install</action> + <action function="page">selectstorage</action> + </actions> </object> <object type="fileselector"> @@ -856,15 +835,6 @@ <page name="confirm_action"> <object type="template" name="header" /> - <object type="button"> - <highlight color="%highlight_color%" /> - <condition var1="tw_show_exclamation" var2="1" /> - <placement x="%exclamation_x%" y="%exclamation_y%" /> - <font resource="font" color="%button_text_color%" /> - <text></text> - <image resource="exclamation" /> - </object> - <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%row1_text_y%" placement="5" /> @@ -1263,220 +1233,92 @@ <object type="template" name="footer" /> </page> - <page name="mount"> + <page name="selectstorage"> <object type="template" name="header" /> - <object type="text" color="%text_color%"> - <font resource="font" /> - <placement x="%center_x%" y="%row1_text_y%" placement="5" /> - <text>Mount Menu</text> - </object> - - <object type="button"> - <condition var1="tw_has_usb_storage" var2="1" /> - <placement x="%col1_x%" y="%row1_y%" /> - <font resource="font" color="%button_text_color%" /> - <text>Mount USB Storage</text> - <image resource="main_button" /> - <action function="page">usb_mount</action> + <object type="partitionlist"> + <highlight color="%fileselector_highlight_color%" /> + <placement x="%col2_x%" y="%fileselector_install_y%" w="%fileselector_folderonly_width%" h="%fileselector_install_height%" /> + <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> + <text>Select Storage:</text> + <icon selected="radio_true" unselected="radio_false" /> + <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> + <background color="%listbox_background%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> + <data name="tw_storage_path" /> + <listtype name="storage" /> </object> - <object type="button"> - <placement x="%col1_x%" y="%row7_text_y%" /> - <font resource="font" color="%text_color%" /> - <condition var1="mounted" op="!=" var2="/system" /> - <text>Mount System</text> - <image resource="checkbox_false" /> - <action function="mount">/system</action> + <object type="action"> + <touch key="home" /> + <action function="page">main</action> </object> - <object type="button"> - <placement x="%col1_x%" y="%row7_text_y%" /> - <font resource="font" color="%text_color%" /> - <condition var1="mounted" op="=" var2="/system" /> - <text>Unmount System</text> - <image resource="checkbox_true" /> - <action function="umount">/system</action> + <object type="action"> + <touch key="back" /> + <actions> + <action function="page">%tw_back%</action> + </actions> </object> - <object type="button"> - <placement x="%col1_x%" y="%row8_text_y%" /> - <font resource="font" color="%text_color%" /> - <condition var1="mounted" op="!=" var2="/data" /> - <text>Mount Data</text> - <image resource="checkbox_false" /> - <action function="mount">/data</action> - </object> + <object type="template" name="footer" /> + </page> - <object type="button"> - <placement x="%col1_x%" y="%row8_text_y%" /> - <font resource="font" color="%text_color%" /> - <condition var1="mounted" op="=" var2="/data" /> - <text>Unmount Data</text> - <image resource="checkbox_true" /> - <action function="umount">/data</action> - </object> + <page name="mount"> + <object type="template" name="header" /> - <object type="button"> - <placement x="%col1_x%" y="%row9_text_y%" /> - <font resource="font" color="%text_color%" /> - <condition var1="mounted" op="!=" var2="/cache" /> - <text>Mount Cache</text> - <image resource="checkbox_false" /> - <action function="mount">/cache</action> + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_text_y%" placement="5" /> + <text>Mount Menu</text> </object> - <object type="button"> - <placement x="%col1_x%" y="%row9_text_y%" /> - <font resource="font" color="%text_color%" /> - <condition var1="mounted" op="=" var2="/cache" /> - <text>Unmount Cache</text> - <image resource="checkbox_true" /> - <action function="umount">/cache</action> + <object type="partitionlist"> + <highlight color="%fileselector_highlight_color%" /> + <placement x="%backup_list_x%" y="%backup_list_y%" w="%backup_list_width%" h="%mount_list_height%" /> + <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> + <text>Select Partitions to Mount:</text> + <icon selected="checkbox_true" unselected="checkbox_false" /> + <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> + <background color="%listbox_background%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> + <listtype name="mount" /> </object> <object type="button"> <highlight color="%highlight_color%" /> - <placement x="%col1_x%" y="%row10_text_y%" /> - <font resource="font" color="%text_color%" /> - <conditions> - <condition var1="tw_has_external" var2="1" /> - <condition var1="mounted" op="!=" var2="EXTERNAL" /> - </conditions> - <text>Mount SDCard</text> - <image resource="checkbox_false" /> - <action function="mount">EXTERNAL</action> - </object> - - <object type="button"> - <placement x="%col1_x%" y="%row10_text_y%" /> - <font resource="font" color="%text_color%" /> - <conditions> - <condition var1="tw_has_external" var2="1" /> - <condition var1="mounted" op="=" var2="EXTERNAL" /> - </conditions> - <text>Unmount SDCard</text> - <image resource="checkbox_true" /> - <action function="umount">EXTERNAL</action> - </object> - - <object type="button"> - <placement x="%col2_x%" y="%row10_text_y%" /> - <font resource="font" color="%text_color%" /> <conditions> - <condition var1="tw_has_internal" var2="1" /> - <condition var1="tw_has_data_media" var2="0" /> - <condition var1="mounted" op="!=" var2="INTERNAL" /> - </conditions> - <text>Mount Internal Storage</text> - <image resource="checkbox_false" /> - <action function="mount">INTERNAL</action> - </object> - - <object type="button"> - <placement x="%col2_x%" y="%row10_text_y%" /> - <font resource="font" color="%text_color%" /> - <conditions> - <condition var1="tw_has_internal" var2="1" /> - <condition var1="tw_has_data_media" var2="0" /> - <condition var1="mounted" op="=" var2="INTERNAL" /> - </conditions> - <text>Unmount Internal Storage</text> - <image resource="checkbox_true" /> - <action function="umount">INTERNAL</action> - </object> - - <object type="button"> - <conditions> - <condition var1="tw_has_sdext_partition" var2="1" /> - <condition var1="mounted" op="!=" var2="/sd-ext" /> - </conditions> - <placement x="%col1_x%" y="%row11_text_y%" /> - <font resource="font" color="%text_color%" /> - <text>Mount SD-Ext</text> - <image resource="checkbox_false" /> - <action function="mount">/sd-ext</action> - </object> - - <object type="button"> - <placement x="%col1_x%" y="%row11_text_y%" /> - <font resource="font" color="%text_color%" /> - <condition var1="mounted" op="=" var2="/sd-ext" /> - <text>Unmount SD-Ext</text> - <image resource="checkbox_true" /> - <action function="umount">/sd-ext</action> - </object> - - <object type="button"> - <conditions> - <condition var1="tw_boot_is_mountable" var2="1" /> - <condition var1="mounted" op="!=" var2="/boot" /> - </conditions> - <placement x="%col1_x%" y="%row12_text_y%" /> - <font resource="font" color="%text_color%" /> - <text>Mount Boot</text> - <image resource="checkbox_false" /> - <action function="mount">/boot</action> - </object> - - <object type="button"> - <conditions> - <condition var1="tw_boot_is_mountable" var2="1" /> - <condition var1="mounted" op="=" var2="/boot" /> - </conditions> - <placement x="%col1_x%" y="%row12_text_y%" /> - <font resource="font" color="%text_color%" /> - <text>Unmount Boot</text> - <image resource="checkbox_true" /> - <action function="umount">/boot</action> - </object> - - <object type="button"> - <placement x="%col1_x%" y="%row13_text_y%" /> - <font resource="font" color="%text_color%" /> - <conditions> - <condition var1="tw_has_dual_storage" var2="1" /> - <condition var1="tw_use_external_storage" var2="1" /> - </conditions> - <text>Using external SD</text> - <image resource="radio_true" /> - <action function="togglestorage">external</action> - </object> - - <object type="button"> - <placement x="%col1_x%" y="%row13_text_y%" /> - <font resource="font" color="%text_color%" /> - <conditions> - <condition var1="tw_has_dual_storage" var2="1" /> - <condition var1="tw_use_external_storage" var2="0" /> + <condition var1="tw_is_encrypted" var2="1" /> + <condition var1="tw_is_decrypted" var2="0" /> </conditions> - <text>Using external SD</text> - <image resource="radio_false" /> - <action function="togglestorage">external</action> + <placement x="%col3_x%" y="row1_y" /> + <font resource="font" color="%button_text_color%" /> + <text>Decrypt Data</text> + <image resource="main_button" /> + <action function="page">decrypt</action> </object> <object type="button"> - <placement x="%col2_x%" y="%row13_text_y%" /> - <font resource="font" color="%text_color%" /> - <conditions> - <condition var1="tw_has_dual_storage" var2="1" /> - <condition var1="tw_use_external_storage" var2="1" /> - </conditions> - <text>Using internal storage</text> - <image resource="radio_false" /> - <action function="togglestorage">internal</action> + <condition var1="tw_has_usb_storage" var2="1" /> + <placement x="%col4_x%" y="%row1_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Mount USB Storage</text> + <image resource="main_button" /> + <action function="page">usb_mount</action> </object> <object type="button"> - <placement x="%col2_x%" y="%row13_text_y%" /> - <font resource="font" color="%text_color%" /> - <conditions> - <condition var1="tw_has_dual_storage" var2="1" /> - <condition var1="tw_use_external_storage" var2="0" /> - </conditions> - <text>Using internal storage</text> - <image resource="radio_true" /> - <action function="togglestorage">internal</action> + <highlight color="%highlight_color%" /> + <fill color="%button_fill_color%" /> + <placement x="%col3_x%" y="%backup_storage_y%" w="%button_fill_main_width%" h="%button_fill_half_height%" /> + <font resource="font" color="%button_text_color%" /> + <text>Storage: %tw_storage_display_name% (%tw_storage_free_size% MB)</text> + <actions> + <action function="set">tw_back=mount</action> + <action function="page">selectstorage</action> + </actions> </object> <object type="action"> @@ -1541,191 +1383,133 @@ <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%row1_text_y%" placement="5" /> - <text>Wipe Menu</text> + <text>Factory Reset: Wipes Data, Cache, and Dalvik</text> + </object> + + <object type="text" color="%text_color%"> + <condition var1="tw_has_data_media" var2="0" /> + <font resource="font" /> + <placement x="%center_x%" y="%row2_text_y%" placement="5" /> + <text>.android_secure</text> + </object> + + <object type="text" color="%text_color%"> + <condition var1="tw_has_data_media" var2="1" /> + <font resource="font" /> + <placement x="%center_x%" y="%row2_text_y%" placement="5" /> + <text>(not including internal storage)</text> + </object> + + <object type="text" color="%text_color%"> + <condition var1="tw_has_sdext_partition" var2="1" /> + <font resource="font" /> + <placement x="%center_x%" y="%row3_text_y%" placement="5" /> + <text>SD-EXT</text> + </object> + + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row4_text_y%" placement="5" /> + <text>Most of the time this is the only wipe that you need.</text> </object> <object type="button"> <highlight color="%highlight_color%" /> - <placement x="%col1_x%" y="%row1_y%" /> + <placement x="%col2_x%" y="%wipe_button_y%" /> <font resource="font" color="%button_text_color%" /> - <text>Cache</text> + <text>Advanced Wipe</text> <image resource="main_button" /> - <actions> - <action function="set">tw_back=wipe</action> - <action function="set">tw_action=wipe</action> - <action function="set">tw_action_param=/cache</action> - <action function="set">tw_text1=Wipe Cache?</action> - <action function="set">tw_action_text1=Wiping Cache...</action> - <action function="set">tw_complete_text1=Cache Wipe Complete</action> - <action function="set">tw_slider_text=Swipe to Wipe</action> - <action function="page">confirm_action</action> - </actions> + <action function="page">advancedwipe</action> </object> <object type="button"> + <conditions> + <condition var1="tw_has_internal" var2="1" /> + <condition var1="tw_has_data_media" var2="1" /> + </conditions> <highlight color="%highlight_color%" /> - <placement x="%col2_x%" y="%row1_y%" /> + <placement x="%col3_x%" y="%wipe_button_y%" /> <font resource="font" color="%button_text_color%" /> - <text>Dalvik Cache</text> + <text>Format Data</text> <image resource="main_button" /> <actions> - <action function="set">tw_back=wipe</action> - <action function="set">tw_action=wipe</action> - <action function="set">tw_action_param=dalvik</action> - <action function="set">tw_text1=Wipe Dalvik-Cache?</action> - <action function="set">tw_action_text1=Wiping Dalvik-Cache...</action> - <action function="set">tw_complete_text1=Dalvik-Cache Wipe Complete</action> - <action function="set">tw_slider_text=Swipe to Wipe</action> - <action function="page">confirm_action</action> + <action function="page">formatdata</action> </actions> </object> - <object type="button"> - <highlight color="%highlight_color%" /> - <placement x="%col3_x%" y="%row1_y%" /> - <font resource="font" color="%button_text_color%" /> - <text>Factory Reset</text> - <image resource="main_button" /> + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row12_text_y%" placement="5" /> + <text>Press back button to cancel.</text> + </object> + + <object type="slider"> + <placement x="%slider_x%" y="%slider_y%" /> + <resource base="slider" used="slider-used" touch="slider-touch" /> <actions> <action function="set">tw_back=wipe</action> <action function="set">tw_action=wipe</action> <action function="set">tw_action_param=data</action> - <action function="set">tw_text1=Factory Reset?</action> - <action function="set">tw_text2=(Wipes Data and Cache)</action> <action function="set">tw_action_text1=Factory Reset...</action> <action function="set">tw_complete_text1=Factory Reset Complete</action> - <action function="set">tw_slider_text=Swipe to Wipe</action> - <action function="page">confirm_action</action> + <action function="page">action_page</action> </actions> </object> - <object type="button"> - <highlight color="%highlight_color%" /> - <placement x="%col4_x%" y="%row1_y%" /> - <font resource="font" color="%button_text_color%" /> - <text>System</text> - <image resource="main_button" /> - <actions> - <action function="set">tw_back=wipe</action> - <action function="set">tw_action=wipe</action> - <action function="set">tw_action_param=/system</action> - <action function="set">tw_text1=Wipe System?</action> - <action function="set">tw_text2=This will wipe your ROM</action> - <action function="set">tw_action_text1=Wiping System...</action> - <action function="set">tw_complete_text1=System Wipe Complete</action> - <action function="set">tw_slider_text=Swipe to Wipe</action> - <action function="page">confirm_action</action> - </actions> + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%slider_text_y%" placement="4" /> + <text>Swipe to Factory Reset</text> </object> - <object type="button"> - <highlight color="%highlight_color%" /> - <condition var1="tw_has_external" var2="1" /> - <placement x="%col1_x%" y="%row2_y%" /> - <font resource="font" color="%button_text_color%" /> - <text>External Storage</text> - <image resource="main_button" /> - <actions> - <action function="set">tw_back=wipe</action> - <action function="set">tw_action=wipe</action> - <action function="set">tw_action_param=EXTERNAL</action> - <action function="set">tw_has_action2=1</action> - <action function="set">tw_action2=set</action> - <action function="set">tw_action2_param=tw_zip_location=/sdcard</action> - <action function="set">tw_text1=Wipe External Storage (SD card)?</action> - <action function="set">tw_action_text1=Wiping External Storage...</action> - <action function="set">tw_complete_text1=External Storage Wipe Complete</action> - <action function="set">tw_slider_text=Swipe to Wipe</action> - <action function="page">confirm_action</action> - </actions> + <object type="action"> + <touch key="home" /> + <action function="page">main</action> </object> - <object type="button"> - <highlight color="%highlight_color%" /> - <condition var1="tw_has_internal" var2="1" /> - <placement x="%col2_x%" y="%row2_y%" /> - <font resource="font" color="%button_text_color%" /> - <text>Internal Storage</text> - <image resource="main_button" /> - <actions> - <action function="set">tw_back=wipe</action> - <action function="set">tw_action=wipe</action> - <action function="set">tw_action_param=INTERNAL</action> - <action function="set">tw_has_action2=1</action> - <action function="set">tw_action2=set</action> - <action function="set">tw_action2_param=tw_zip_location=/sdcard</action> - <action function="set">tw_text1=Wipe Internal Storage?</action> - <action function="set">tw_action_text1=Wiping Internal Storage...</action> - <action function="set">tw_complete_text1=Internal Storage Wipe Complete</action> - <action function="set">tw_slider_text=Swipe to Wipe</action> - <action function="page">confirm_action</action> - </actions> + <object type="action"> + <touch key="back" /> + <action function="page">main</action> </object> - <object type="button"> - <highlight color="%highlight_color%" /> - <conditions> - <condition var1="tw_has_internal" var2="1" /> - <condition var1="tw_has_data_media" var2="1" /> - </conditions> - <placement x="%col3_x%" y="%row2_y%" /> - <font resource="font" color="%button_text_color%" /> - <text>Format Data</text> - <image resource="main_button" /> - <actions> - <action function="set">tw_back=wipe</action> - <action function="set">tw_action=wipe</action> - <action function="set">tw_action_param=DATAMEDIA</action> - <action function="set">tw_has_action2=1</action> - <action function="set">tw_action2=set</action> - <action function="set">tw_action2_param=tw_zip_location=/sdcard</action> - <action function="set">tw_text1=Format Data? (This wipes all media</action> - <action function="set">tw_text2=including backups & removes encryption)</action> - <action function="set">tw_text3=Most of the time you do not need to do this.</action> - <action function="set">tw_action_text1=Formatting Data...</action> - <action function="set">tw_complete_text1=Data Format Complete</action> - <action function="set">tw_slider_text=Swipe to Format</action> - <action function="set">tw_show_exclamation=1</action> - <action function="page">confirm_action</action> - </actions> + <object type="template" name="footer" /> + </page> + + <page name="advancedwipe"> + <object type="template" name="header" /> + + <object type="partitionlist"> + <highlight color="%fileselector_highlight_color%" /> + <placement x="%listbox_x%" y="%row2_text_y%" w="%listbox_width%" h="%wipe_list_height%" /> + <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> + <text>Select Partitions to Wipe:</text> + <icon selected="checkbox_true" unselected="checkbox_false" /> + <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> + <background color="%listbox_background%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> + <data name="tw_wipe_list" /> + <listtype name="wipe" /> </object> - <object type="button"> - <highlight color="%highlight_color%" /> - <condition var1="tw_has_data_media" var2="0" /> - <placement x="%col3_x%" y="%row2_y%" /> - <font resource="font" color="%button_text_color%" /> - <text>Android Secure</text> - <image resource="main_button" /> + <object type="slider"> + <placement x="%slider_x%" y="%slider_y%" /> + <resource base="slider" used="slider-used" touch="slider-touch" /> <actions> - <action function="set">tw_back=wipe</action> + <action function="set">tw_back=advancedwipe</action> <action function="set">tw_action=wipe</action> - <action function="set">tw_action_param=ANDROIDSECURE</action> - <action function="set">tw_text1=Wipe Android Secure?</action> - <action function="set">tw_action_text1=Wiping Android Secure...</action> - <action function="set">tw_complete_text1=Wipe Android Secure Complete</action> - <action function="set">tw_slider_text=Swipe to Format</action> - <action function="page">confirm_action</action> + <action function="set">tw_action_param=LIST</action> + <action function="set">tw_text1=Wipe Selected Partition(s)?</action> + <action function="set">tw_action_text1=Wiping Partition(s)...</action> + <action function="set">tw_complete_text1=Wipe Complete</action> + <action function="page">action_page</action> </actions> </object> - <object type="button"> - <highlight color="%highlight_color%" /> - <condition var1="tw_has_sdext_partition" var2="1" /> - <placement x="%col4_x%" y="%row2_y%" /> - <font resource="font" color="%button_text_color%" /> - <text>SD Ext</text> - <image resource="main_button" /> - <actions> - <action function="set">tw_back=wipe</action> - <action function="set">tw_action=wipe</action> - <action function="set">tw_action_param=/sd-ext</action> - <action function="set">tw_text1=Wipe SD-Ext?</action> - <action function="set">tw_action_text1=Wiping SD-Ext...</action> - <action function="set">tw_complete_text1=SD-Ext Wipe Complete</action> - <action function="set">tw_slider_text=Swipe to Wipe</action> - <action function="page">confirm_action</action> - </actions> + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%slider_text_y%" placement="4" /> + <text>Swipe to Wipe</text> </object> <object type="action"> @@ -1735,182 +1519,160 @@ <object type="action"> <touch key="back" /> - <action function="page">main</action> + <action function="page">wipe</action> </object> <object type="template" name="footer" /> </page> - <page name="backup"> + <page name="formatdata"> <object type="template" name="header" /> <object type="text" color="%text_color%"> <font resource="font" /> <placement x="%center_x%" y="%row1_text_y%" placement="5" /> - <text>Back Up Device</text> + <text>Format Data will wipe all of your apps, backups, pictures,</text> </object> <object type="text" color="%text_color%"> <font resource="font" /> - <placement x="%col1_x%" y="%row2_text_y%" placement="0" /> - <text>Free Space: %tw_storage_free_size% MB</text> + <placement x="%center_x%" y="%row2_text_y%" placement="5" /> + <text>videos, media, and removes encryption on internal storage.</text> </object> <object type="text" color="%text_color%"> <font resource="font" /> - <placement x="%col_right_x%" y="%row2_text_y%" placement="1" /> - <text>Backup Name: %tw_backup_name%</text> + <placement x="%center_x%" y="%row3_text_y%" placement="5" /> + <text>This cannot be undone. Press back to cancel.</text> </object> - <object type="checkbox"> - <placement x="%nandcheck_col1%" y="%nandcheck_row1%" /> - <font resource="font" color="%text_color%" /> - <text>System (%tw_backup_system_size% MB)</text> - <data variable="tw_backup_system" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row4_text_y%" placement="5" /> + <text>Type yes to continue.</text> </object> - <object type="checkbox"> - <placement x="%nandcheck_col1%" y="%nandcheck_row2%" /> + <object type="input"> + <placement x="%input_x%" y="%row6_text_y%" w="%input_width%" h="%input_height%" placement="0" /> + <background color="%input_background_color%" /> + <cursor color="%input_cursor_color%" hasfocus="1" width="%input_cursor_width%" /> <font resource="font" color="%text_color%" /> - <text>Data (%tw_backup_data_size% MB)</text> - <data variable="tw_backup_data" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> + <text>%tw_confirm_formatdata%</text> + <data name="tw_confirm_formatdata" /> + <restrict minlen="3" maxlen="3" allow="yes" /> + <action function="page">formatdata_confirm</action> </object> - <object type="checkbox"> - <condition var1="tw_has_boot_partition" var2="1" /> - <placement x="%nandcheck_col1%" y="%nandcheck_row3%" /> - <font resource="font" color="%text_color%" /> - <text>Boot (%tw_backup_boot_size% MB)</text> - <data variable="tw_backup_boot" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> + <object type="template" name="keyboardtemplate" /> - <object type="checkbox"> - <condition var1="tw_has_recovery_partition" var2="1" /> - <placement x="%nandcheck_col1%" y="%nandcheck_row4%" /> - <font resource="font" color="%text_color%" /> - <text>Recovery (%tw_backup_recovery_size% MB)</text> - <data variable="tw_backup_recovery" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> + <object type="action"> + <touch key="home" /> + <action function="page">main</action> </object> - <object type="checkbox"> - <placement x="%nandcheck_col1%" y="%nandcheck_row5%" /> - <font resource="font" color="%text_color%" /> - <text>Cache (%tw_backup_cache_size% MB)</text> - <data variable="tw_backup_cache" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> + <object type="action"> + <touch key="back" /> + <action function="page">wipe</action> </object> - <object type="checkbox"> - <condition var1="tw_has_android_secure" var2="1" /> - <placement x="%nandcheck_col2%" y="%nandcheck_row1%" /> - <font resource="font" color="%text_color%" /> - <text>.android_secure (%tw_backup_andsec_size% MB)</text> - <data variable="tw_backup_andsec" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> + <object type="template" name="footer" /> + </page> - <object type="checkbox"> - <condition var1="tw_has_sdext_partition" var2="1" /> - <placement x="%nandcheck_col2%" y="%nandcheck_row2%" /> - <font resource="font" color="%text_color%" /> - <text>sd-ext (%tw_backup_sdext_size% MB)</text> - <data variable="tw_backup_sdext" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> + <page name="formatdata_confirm"> + <object type="action"> + <condition var1="tw_confirm_formatdata" op="=" var2="yes" /> + <actions> + <action function="set">tw_back=formatdata</action> + <action function="set">tw_action=wipe</action> + <action function="set">tw_action_param=DATAMEDIA</action> + <action function="set">tw_action_text1=Formatting Data...</action> + <action function="set">tw_complete_text1=Data Format Complete</action> + <action function="page">action_page</action> + </actions> </object> - <object type="checkbox"> - <condition var1="tw_sp1_name" op=">" var2="" /> - <placement x="%nandcheck_col2%" y="%nandcheck_row3%" /> - <font resource="font" color="%text_color%" /> - <text>%tw_sp1_name% (%tw_backup_sp1_size% MB)</text> - <data variable="tw_backup_sp1" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> + <object type="action"> + <condition var1="tw_confirm_formatdata" op="!=" var2="yes" /> + <action function="page">formatdata</function> </object> + </page> - <object type="checkbox"> - <condition var1="tw_sp2_name" op=">" var2="" /> - <placement x="%nandcheck_col2%" y="%nandcheck_row4%" /> - <font resource="font" color="%text_color%" /> - <text>%tw_sp2_name% (%tw_backup_sp2_size% MB)</text> - <data variable="tw_backup_sp2" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> + <page name="backup"> + <object type="template" name="header" /> - <object type="checkbox"> - <condition var1="tw_sp3_name" op=">" var2="" /> - <placement x="%nandcheck_col2%" y="%nandcheck_row5%" /> - <font resource="font" color="%text_color%" /> - <text>%tw_sp3_name% (%tw_backup_sp3_size% MB)</text> - <data variable="tw_backup_sp3" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%center_x%" y="%row1_text_y%" placement="5" /> + <text>Back Up Device</text> </object> - <object type="checkbox"> - <placement x="%col1_x%" y="%nandcheck_row6%" /> - <font resource="font" color="%text_color%" /> - <text>Enable Compression (Requires more time)</text> - <data variable="tw_use_compression" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> + <object type="partitionlist"> + <highlight color="%fileselector_highlight_color%" /> + <placement x="%backup_list_x%" y="%backup_list_y%" w="%backup_list_width%" h="%backup_list_height%" /> + <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> + <text>Select Partitions to Back Up:</text> + <icon selected="checkbox_true" unselected="checkbox_false" /> + <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> + <background color="%listbox_background%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> + <data name="tw_backup_list" /> + <listtype name="backup" /> </object> - <object type="checkbox"> - <placement x="%col3_x%" y="%nandcheck_row6%" /> - <font resource="font" color="%text_color%" /> - <text>Skip MD5 generation on backups</text> - <data variable="tw_skip_md5_generate" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> + <object type="text" color="%text_color%"> + <font resource="font" /> + <placement x="%col_right_x%" y="%row2_text_y%" placement="1" /> + <text>Backup Name: %tw_backup_name%</text> </object> <object type="button"> - <placement x="%col2_x%" y="%nandcheck_row7%" /> - <font resource="font" color="%text_color%" /> - <conditions> - <condition var1="tw_has_dual_storage" var2="1" /> - <condition var1="tw_use_external_storage" var2="1" /> - </conditions> - <text>Using external SD</text> - <image resource="radio_true" /> - <action function="togglestorage">external</action> + <highlight color="%highlight_color%" /> + <placement x="%col3_x%" y="%row1_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Refresh Sizes</text> + <image resource="main_button" /> + <action function="refreshsizes"></action> </object> <object type="button"> - <placement x="%col2_x%" y="%nandcheck_row7%" /> - <font resource="font" color="%text_color%" /> - <conditions> - <condition var1="tw_has_dual_storage" var2="1" /> - <condition var1="tw_use_external_storage" var2="0" /> - </conditions> - <text>Using external SD</text> - <image resource="radio_false" /> - <action function="togglestorage">external</action> + <highlight color="%highlight_color%" /> + <placement x="%col4_x%" y="%row1_y%" /> + <font resource="font" color="%button_text_color%" /> + <text>Set Backup Name</text> + <image resource="main_button" /> + <actions> + <action function="set">tw_fileexists=0</action> + <action function="page">backupname1</action> + </actions> </object> <object type="button"> - <placement x="%col3_x%" y="%nandcheck_row7%" /> + <highlight color="%highlight_color%" /> + <fill color="%button_fill_color%" /> + <placement x="%col3_x%" y="%backup_storage_y%" w="%button_fill_main_width%" h="%button_fill_half_height%" /> + <font resource="font" color="%button_text_color%" /> + <text>Storage: %tw_storage_display_name% (%tw_storage_free_size% MB)</text> + <actions> + <action function="set">tw_back=backup</action> + <action function="page">selectstorage</action> + </actions> + </object> + + <object type="checkbox"> + <placement x="%col3_x%" y="%nandcheck_row6%" /> <font resource="font" color="%text_color%" /> - <conditions> - <condition var1="tw_has_dual_storage" var2="1" /> - <condition var1="tw_use_external_storage" var2="1" /> - </conditions> - <text>Using internal storage</text> - <image resource="radio_false" /> - <action function="togglestorage">internal</action> + <text>Enable Compression (Requires more time)</text> + <data variable="tw_use_compression" /> + <image checked="checkbox_true" unchecked="checkbox_false" /> </object> - <object type="button"> + <object type="checkbox"> <placement x="%col3_x%" y="%nandcheck_row7%" /> <font resource="font" color="%text_color%" /> - <conditions> - <condition var1="tw_has_dual_storage" var2="1" /> - <condition var1="tw_use_external_storage" var2="0" /> - </conditions> - <text>Using internal storage</text> - <image resource="radio_true" /> - <action function="togglestorage">internal</action> + <text>Skip MD5 generation on backups</text> + <data variable="tw_skip_md5_generate" /> + <image checked="checkbox_true" unchecked="checkbox_false" /> </object> <object type="slider"> @@ -1928,27 +1690,6 @@ <text>Swipe to Back Up</text> </object> - <object type="button"> - <highlight color="%highlight_color%" /> - <placement x="%col4_x%" y="%row1_y%" /> - <font resource="font" color="%button_text_color%" /> - <text>Refresh Sizes</text> - <image resource="main_button" /> - <action function="refreshsizes"></action> - </object> - - <object type="button"> - <highlight color="%highlight_color%" /> - <placement x="%col4_x%" y="%backup_name_button_y%" /> - <font resource="font" color="%button_text_color%" /> - <text>Set Backup Name</text> - <image resource="main_button" /> - <actions> - <action function="set">tw_fileexists=0</action> - <action function="page">backupname1</action> - </actions> - </object> - <object type="action"> <touch key="home" /> <action function="page">main</action> @@ -2072,51 +1813,15 @@ <object type="template" name="header" /> <object type="button"> - <placement x="%col2_x%" y="%zipstorage_text_y%" /> - <font resource="font" color="%text_color%" /> - <conditions> - <condition var1="tw_has_dual_storage" var2="1" /> - <condition var1="tw_use_external_storage" var2="1" /> - </conditions> - <text>Using external SD</text> - <image resource="radio_true" /> - <action function="togglestorage">external</action> - </object> - - <object type="button"> - <placement x="%col2_x%" y="%zipstorage_text_y%" /> - <font resource="font" color="%text_color%" /> - <conditions> - <condition var1="tw_has_dual_storage" var2="1" /> - <condition var1="tw_use_external_storage" var2="0" /> - </conditions> - <text>Using external SD</text> - <image resource="radio_false" /> - <action function="togglestorage">external</action> - </object> - - <object type="button"> - <placement x="%col3_x%" y="%zipstorage_text_y%" /> - <font resource="font" color="%text_color%" /> - <conditions> - <condition var1="tw_has_dual_storage" var2="1" /> - <condition var1="tw_use_external_storage" var2="1" /> - </conditions> - <text>Using internal storage</text> - <image resource="radio_false" /> - <action function="togglestorage">internal</action> - </object> - - <object type="button"> - <placement x="%col3_x%" y="%zipstorage_text_y%" /> - <font resource="font" color="%text_color%" /> - <conditions> - <condition var1="tw_has_dual_storage" var2="1" /> - <condition var1="tw_use_external_storage" var2="0" /> - </conditions> - <text>Using internal storage</text> - <image resource="radio_true" /> - <action function="togglestorage">internal</action> + <highlight color="%highlight_color%" /> + <fill color="%button_fill_color%" /> + <placement x="%col2_x%" y="%zipstorage_text_y%" w="%fileselector_folderonly_width%" h="%button_fill_quarter_height%" /> + <font resource="font" color="%button_text_color%" /> + <text>Storage: %tw_storage_display_name% (%tw_storage_free_size% MB)</text> + <actions> + <action function="set">tw_back=restore</action> + <action function="page">selectstorage</action> + </actions> </object> <object type="fileselector"> @@ -2146,19 +1851,6 @@ </actions> </object> - <object type="button"> - <highlight color="%highlight_color%" /> - <conditions> - <condition var1="tw_is_encrypted" var2="1" /> - <condition var1="tw_is_decrypted" var2="0" /> - </conditions> - <placement x="%col2_x%" y="row3_y" /> - <font resource="font" color="%button_text_color%" /> - <text>Decrypt Data</text> - <image resource="main_button" /> - <action function="page">decrypt</action> - </object> - <object type="action"> <touch key="home" /> <action function="page">main</action> @@ -2187,89 +1879,22 @@ <text>Package Date: %tw_restore_file_date%</text> </object> - <object type="checkbox"> - <placement x="%nandcheck_col1%" y="%nandcheck_row1%" /> - <font resource="font" color="%text_color%" /> - <text>System</text> - <condition var1="tw_restore_system" op=">=" var2="0" /> - <data variable="tw_restore_system" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="checkbox"> - <placement x="%nandcheck_col1%" y="%nandcheck_row2%" /> - <font resource="font" color="%text_color%" /> - <text>Data</text> - <condition var1="tw_restore_data" op=">=" var2="0" /> - <data variable="tw_restore_data" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="checkbox"> - <placement x="%nandcheck_col1%" y="%nandcheck_row3%" /> - <font resource="font" color="%text_color%" /> - <text>Boot</text> - <condition var1="tw_restore_boot" op=">=" var2="0" /> - <data variable="tw_restore_boot" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="checkbox"> - <placement x="%nandcheck_col1%" y="%nandcheck_row5%" /> - <font resource="font" color="%text_color%" /> - <text>Cache</text> - <condition var1="tw_restore_cache" op=">=" var2="0" /> - <data variable="tw_restore_cache" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="checkbox"> - <placement x="%nandcheck_col2%" y="%nandcheck_row1%" /> - <font resource="font" color="%text_color%" /> - <text>.android_secure</text> - <condition var1="tw_restore_andsec" op=">=" var2="0" /> - <data variable="tw_restore_andsec" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="checkbox"> - <placement x="%nandcheck_col2%" y="%nandcheck_row2%" /> - <font resource="font" color="%text_color%" /> - <text>sd-ext</text> - <condition var1="tw_restore_sdext" op=">=" var2="0" /> - <data variable="tw_restore_sdext" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="checkbox"> - <placement x="%nandcheck_col2%" y="%nandcheck_row3%" /> - <font resource="font" color="%text_color%" /> - <text>%tw_sp1_name%</text> - <condition var1="tw_restore_sp1" op=">=" var2="0" /> - <data variable="tw_restore_sp1" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="checkbox"> - <placement x="%nandcheck_col2%" y="%nandcheck_row4%" /> - <font resource="font" color="%text_color%" /> - <text>%tw_sp2_name%</text> - <condition var1="tw_restore_sp2" op=">=" var2="0" /> - <data variable="tw_restore_sp2" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> - </object> - - <object type="checkbox"> - <placement x="%nandcheck_col2%" y="%nandcheck_row5%" /> - <font resource="font" color="%text_color%" /> - <text>%tw_sp3_name%</text> - <condition var1="tw_restore_sp3" op=">=" var2="0" /> - <data variable="tw_restore_sp3" /> - <image checked="checkbox_true" unchecked="checkbox_false" /> + <object type="partitionlist"> + <highlight color="%fileselector_highlight_color%" /> + <placement x="%backup_list_x%" y="%restore_list_y%" w="%backup_list_width%" h="%restore_list_height%" /> + <header background="%fileselector_header_background%" textcolor="%fileselector_header_textcolor%" separatorcolor="%fileselector_header_separatorcolor%" separatorheight="%fileselector_header_separatorheight%" /> + <fastscroll linecolor="%fastscroll_linecolor%" rectcolor="%fastscroll_rectcolor%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%" /> + <text>Select Partitions to Restore:</text> + <icon selected="checkbox_true" unselected="checkbox_false" /> + <separator color="%fileselector_separatorcolor%" height="%fileselector_separatorheight%" /> + <background color="%listbox_background%" /> + <font resource="font" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%fileselector_highlight_font_color%" /> + <data name="tw_restore_list" selectedlist="tw_restore_selected" /> + <listtype name="restore" /> </object> <object type="checkbox"> - <placement x="%col1_x%" y="%nandcheck_row6%" /> + <placement x="%col3_x%" y="%nandcheck_row6%" /> <font resource="font" color="%text_color%" /> <text>Enable MD5 checking of backup files</text> <data variable="tw_skip_md5_check" /> @@ -2291,7 +1916,7 @@ <object type="button"> <highlight color="%highlight_color%" /> - <placement x="%col4_x%" y="%backup_name_button_y%" /> + <placement x="%col3_x%" y="%row1_y%" /> <font resource="font" color="%button_text_color%" /> <text>Delete Backup</text> <image resource="main_button" /> |