diff options
Diffstat (limited to 'gui')
| -rwxr-xr-x | gui/action.cpp | 3 | ||||
| -rwxr-xr-x | gui/theme/common/landscape.xml | 19 | ||||
| -rwxr-xr-x | gui/theme/common/languages/en.xml | 11 | ||||
| -rwxr-xr-x | gui/theme/common/portrait.xml | 19 | ||||
| -rwxr-xr-x | gui/theme/common/watch.xml | 19 |
5 files changed, 64 insertions, 7 deletions
diff --git a/gui/action.cpp b/gui/action.cpp index 11d9580fb..4b644a9b4 100755 --- a/gui/action.cpp +++ b/gui/action.cpp @@ -490,6 +490,8 @@ void GUIAction::operation_start(const string operation_name) DataManager::SetValue("tw_operation", operation_name); DataManager::SetValue("tw_operation_state", 0); DataManager::SetValue("tw_operation_status", 0); + bool tw_ab_device = TWFunc::get_cache_dir() != NON_AB_CACHE_DIR; + DataManager::SetValue("tw_ab_device", tw_ab_device); } void GUIAction::operation_end(const int operation_status) @@ -1059,7 +1061,6 @@ int GUIAction::wipe(std::string arg) { operation_start("Format"); DataManager::SetValue("tw_partition", arg); - int ret_val = false; if (simulate) { diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml index f6f14bc51..d1bce168d 100755 --- a/gui/theme/common/landscape.xml +++ b/gui/theme/common/landscape.xml @@ -527,8 +527,9 @@ <template name="console"/> <button style="main_button_half_width"> + <condition var1="tw_ab_device" var2="0"/> <placement x="%col2_x_left%" y="%row15a_y%"/> - <text>{@wipe_cache_dalvik_btn=Wipe cache/dalvik}</text> + <text>{@wipe_cache_dalvik_btn=Wipe Cache/Dalvik}</text> <actions> <action function="set">tw_back=flash_done</action> <action function="set">tw_action=wipe</action> @@ -545,6 +546,22 @@ </button> <button style="main_button_half_width"> + <condition var1="tw_ab_device" var2="1"/> + <placement x="%indent%" y="%row21a_y%"/> + <text>{@wipe_dalvik_btn=Wipe Dalvik}</text> + <actions> + <action function="set">tw_back=flash_done</action> + <action function="set">tw_action=wipe</action> + <action function="set">tw_action_param=dalvik</action> + <action function="set">tw_text1={@wipe_dalvik_confirm=Wipe Dalvik?}</action> + <action function="set">tw_action_text1={@wiping_cache_dalvik=Wiping Dalvik...}</action> + <action function="set">tw_complete_text1={@wipe_dalvik_complete=Dalvik Wipe Complete}</action> + <action function="set">tw_slider_text={@swipe_wipe=Swipe to Wipe}</action> + <action function="page">confirm_action</action> + </actions> + </button> + + <button style="main_button_half_width"> <placement x="%center_x%" y="%row15a_y%"/> <text>{@reboot_system_btn=Reboot System}</text> <actions> diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml index 03d4e084c..f8de66221 100755 --- a/gui/theme/common/languages/en.xml +++ b/gui/theme/common/languages/en.xml @@ -98,7 +98,8 @@ <string name="successful">Successful</string> <string name="install_failed">Installation Failed</string> <string name="install_successful">Installation Successful</string> - <string name="wipe_cache_dalvik_btn">Wipe cache/dalvik</string> + <string name="wipe_cache_dalvik_btn">Wipe Cache/Dalvik</string> + <string name="wipe_dalvik_btn">Wipe Dalvik</string> <string name="reboot_system_btn">Reboot System</string> <string name="install_sel_target">Select Target Partition</string> <string name="flash_image_select">Select Partition to Flash Image:</string> @@ -106,8 +107,11 @@ <string name="flashing_image">Flashing Image...</string> <string name="image_flashed">Image Flashed</string> <string name="wipe_cache_dalvik_confirm">Wipe Cache & Dalvik?</string> + <string name="wipe_dalvik_confirm">Wipe Dalvik?</string> <string name="wiping_cache_dalvik">Wiping Cache & Dalvik...</string> + <string name="wiping_dalvik">Wiping Dalvik...</string> <string name="wipe_cache_dalvik_complete">Cache & Dalvik Wipe Complete</string> + <string name="wipe_dalvik_complete">Dalvik Wipe Complete</string> <string name="swipe_wipe">Swipe to Wipe</string> <string name="swipe_wipe_s"> Wipe</string> <string name="no_os1">No OS Installed! Are you</string> @@ -532,9 +536,10 @@ <string name="unable_find_part_path">Unable to find partition for path '{1}'</string> <string name="update_part_details">Updating partition details...</string> <string name="update_part_details_done">...done</string> - <string name="wiping_dalvik">Wiping Dalvik Cache Directories...</string> + <string name="wiping_dalvik">Wiping Dalvik Directories...</string> <string name="cleaned">Cleaned: {1}...</string> - <string name="dalvik_done">-- Dalvik Cache Directories Wipe Complete!</string> + <string name="cache_dalvik_done">-- Dalvik Cache Directories Wipe Complete!</string> + <string name="dalvik_done">-- Dalvik Directory Wipe Complete!</string> <string name="no_andsec">No android secure partitions found.</string> <string name="unable_to_locate">Unable to locate {1}.</string> <string name="wiping_datamedia">Wiping internal storage -- /data/media...</string> diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml index 09b7c6b70..1cf4d8980 100755 --- a/gui/theme/common/portrait.xml +++ b/gui/theme/common/portrait.xml @@ -479,8 +479,9 @@ <template name="console"/> <button style="main_button_half_height"> + <condition var1="tw_ab_device" var2="0"/> <placement x="%indent%" y="%row21a_y%"/> - <text>{@wipe_cache_dalvik_btn=Wipe cache/dalvik}</text> + <text>{@wipe_cache_dalvik_btn=Wipe Cache/Dalvik}</text> <actions> <action function="set">tw_back=flash_done</action> <action function="set">tw_action=wipe</action> @@ -497,6 +498,22 @@ </button> <button style="main_button_half_height"> + <condition var1="tw_ab_device" var2="1"/> + <placement x="%indent%" y="%row21a_y%"/> + <text>{@wipe_dalvik_btn=Wipe Dalvik}</text> + <actions> + <action function="set">tw_back=flash_done</action> + <action function="set">tw_action=wipe</action> + <action function="set">tw_action_param=dalvik</action> + <action function="set">tw_text1={@wipe_dalvik_confirm=Wipe Dalvik?}</action> + <action function="set">tw_action_text1={@wiping_cache_dalvik=Wiping Dalvik...}</action> + <action function="set">tw_complete_text1={@wipe_dalvik_complete=Dalvik Wipe Complete}</action> + <action function="set">tw_slider_text={@swipe_wipe=Swipe to Wipe}</action> + <action function="page">confirm_action</action> + </actions> + </button> + + <button style="main_button_half_height"> <placement x="%center_x%" y="%row21a_y%"/> <text>{@reboot_system_btn=Reboot System}</text> <actions> diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml index d36bb2d5a..56bdc5534 100755 --- a/gui/theme/common/watch.xml +++ b/gui/theme/common/watch.xml @@ -706,6 +706,7 @@ <template name="console"/> <button style="main_button_half_height"> + <condition var1="tw_ab_device" var2="0"/> <placement x="%col1_x_left%" y="%row13_y%"/> <text>{@wipe_cache_dalvik_btn=Wipe cache/dalvik}</text> <actions> @@ -718,7 +719,23 @@ <action function="set">tw_text1={@wipe_cache_dalvik_confirm=Wipe Cache & Dalvik?}</action> <action function="set">tw_action_text1={@wiping_cache_dalvik=Wiping Cache & Dalvik...}</action> <action function="set">tw_complete_text1={@wipe_cache_dalvik_complete=Cache & Dalvik Wipe Complete}</action> - <action function="set">tw_slider_text={@swipe_wipe_s= Wipe}</action> + <action function="set">tw_slider_text={@swipe_wipe=Swipe to Wipe}</action> + <action function="page">confirm_action</action> + </actions> + </button> + + <button style="main_button_half_height"> + <condition var1="tw_ab_device" var2="1"/> + <placement x="%indent%" y="%row21a_y%"/> + <text>{@wipe_dalvik_btn=Wipe Dalvik}</text> + <actions> + <action function="set">tw_back=flash_done</action> + <action function="set">tw_action=wipe</action> + <action function="set">tw_action_param=dalvik</action> + <action function="set">tw_text1={@wipe_dalvik_confirm=Wipe Dalvik?}</action> + <action function="set">tw_action_text1={@wiping_cache_dalvik=Wiping Dalvik...}</action> + <action function="set">tw_complete_text1={@wipe_dalvik_complete=Dalvik Wipe Complete}</action> + <action function="set">tw_slider_text={@swipe_wipe=Swipe to Wipe}</action> <action function="page">confirm_action</action> </actions> </button> |