diff options
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/action.cpp | 14 | ||||
| -rw-r--r-- | gui/objects.hpp | 1 | ||||
| -rwxr-xr-x | gui/theme/common/landscape.xml | 29 | ||||
| -rwxr-xr-x | gui/theme/common/languages/en.xml | 20 | ||||
| -rwxr-xr-x | gui/theme/common/portrait.xml | 29 | ||||
| -rwxr-xr-x | gui/theme/common/watch.xml | 29 |
6 files changed, 56 insertions, 66 deletions
diff --git a/gui/action.cpp b/gui/action.cpp index 240db8f24..e08111850 100644 --- a/gui/action.cpp +++ b/gui/action.cpp @@ -209,6 +209,7 @@ GUIAction::GUIAction(xml_node<>* node) ADD_ACTION(wipe); ADD_ACTION(refreshsizes); ADD_ACTION(nandroid); + ADD_ACTION(fixcontexts); ADD_ACTION(fixpermissions); ADD_ACTION(dd); ADD_ACTION(partitionsd); @@ -1219,16 +1220,16 @@ int GUIAction::cancelbackup(std::string arg __unused) { return 0; } -int GUIAction::fixpermissions(std::string arg __unused) +int GUIAction::fixcontexts(std::string arg __unused) { int op_status = 0; - operation_start("Fix Permissions"); - LOGINFO("fix permissions started!\n"); + operation_start("Fix Contexts"); + LOGINFO("fix contexts started!\n"); if (simulate) { simulate_progress_bar(); } else { - op_status = PartitionManager.Fix_Permissions(); + op_status = PartitionManager.Fix_Contexts(); if (op_status != 0) op_status = 1; // failure } @@ -1236,6 +1237,11 @@ int GUIAction::fixpermissions(std::string arg __unused) return 0; } +int GUIAction::fixpermissions(std::string arg) +{ + return fixcontexts(arg); +} + int GUIAction::dd(std::string arg) { operation_start("imaging"); diff --git a/gui/objects.hpp b/gui/objects.hpp index e7ade18a5..d64a5fcfd 100644 --- a/gui/objects.hpp +++ b/gui/objects.hpp @@ -337,6 +337,7 @@ protected: int wipe(std::string arg); int refreshsizes(std::string arg); int nandroid(std::string arg); + int fixcontexts(std::string arg); int fixpermissions(std::string arg); int dd(std::string arg); int partitionsd(std::string arg); diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml index 3bbb8bebd..7ce8d6534 100755 --- a/gui/theme/common/landscape.xml +++ b/gui/theme/common/landscape.xml @@ -3094,9 +3094,10 @@ </button> <button style="main_button"> + <condition var1="tw_has_data_media" var2="1"/> <placement x="%center_x%" y="%row2_y%"/> - <text>{@fix_perm_btn=Fix Permissions}</text> - <action function="page">fixperms</action> + <text>{@fix_context_btn=Fix Contexts}</text> + <action function="page">fixcontexts</action> </button> <button style="main_button"> @@ -4467,7 +4468,7 @@ </action> </page> - <page name="fixperms"> + <page name="fixcontexts"> <template name="page"/> <text style="text_l"> @@ -4477,37 +4478,31 @@ <text style="text_m"> <placement x="%col1_x_header%" y="%row4_header_y%"/> - <text>{@fix_perms_hdr=Fix Permissions}</text> + <text>{@fix_contexts_hdr=Fix Contexts}</text> </text> <text style="text_m_accent"> <placement x="%center_x%" y="%row2_y%" placement="5"/> - <text>{@fix_perms_note=Note: Fixing permissions is rarely needed.}</text> + <text>{@fix_contexts_note1=Note: Fixing contexts is rarely needed.}</text> </text> - <checkbox> - <placement x="%col2_x_left%" y="%row4_y%"/> - <text>{@fix_perms_selinux_chk=Also fix SELinux Contexts}</text> - <data variable="tw_fixperms_restorecon"/> - </checkbox> - <text style="text_m_fail"> <placement x="%center_x%" y="%row6_y%" placement="5"/> - <text>{@fix_perms_sel_note1=Fixing SELinux Contexts may cause}</text> + <text>{@fix_contexts_note2=Fixing SELinux Contexts may cause}</text> </text> <text style="text_m_fail"> <placement x="%center_x%" y="%row7_y%" placement="5"/> - <text>{@fix_perms_sel_note2=your device to not boot properly.}</text> + <text>{@fix_contexts_note3=your device to not boot properly.}</text> </text> <slider style="slider_centered"> - <text>{@swipe_to_fix_perms=Swipe to Fix Permissions}</text> + <text>{@swipe_to_fix_contexts=Swipe to Fix Contexts}</text> <actions> <action function="set">tw_back=advanced</action> - <action function="set">tw_action=fixpermissions</action> - <action function="set">tw_action_text1={@fixing_perms=Fixing Permissions...}</action> - <action function="set">tw_complete_text1={@fix_perms_complete=Fix Permissions Complete}</action> + <action function="set">tw_action=fixcontexts</action> + <action function="set">tw_action_text1={@fixing_contexts=Fixing Contexts...}</action> + <action function="set">tw_complete_text1={@fix_contexts_complete=Fix Contexts Complete}</action> <action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action> <action function="set">tw_show_reboot=1</action> <action function="page">action_page</action> diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml index 8c04af3fc..1bb9b6842 100755 --- a/gui/theme/common/languages/en.xml +++ b/gui/theme/common/languages/en.xml @@ -365,8 +365,7 @@ <string name="copy_log_confirm">Copy Log to SD Card?</string> <string name="copying_log">Copying Log to SD Card...</string> <string name="copy_log_complete">Log Copy Complete</string> - <string name="fix_perm_btn">Fix Permissions</string> - <string name="fix_perm_s_btn">Fix Perms</string> + <string name="fix_context_btn">Fix Contexts</string> <string name="part_sd_btn">Partition SD Card</string> <string name="part_sd_s_btn">SD Card</string> <string name="file_manager_btn">File Manager</string> @@ -453,15 +452,14 @@ <string name="sideload_confirm">ADB Sideload</string> <string name="sideload_usage">Usage: adb sideload filename.zip</string> <string name="sideload_complete">ADB Sideload Complete</string> - <string name="fix_perms_hdr">Fix Permissions</string> - <string name="fix_perms_note">Note: Fixing permissions is rarely needed.</string> - <string name="fix_perms_selinux_chk">Also fix SELinux Contexts</string> - <string name="fix_perms_sel_note1">Fixing SELinux Contexts may cause</string> - <string name="fix_perms_sel_note2">your device to not boot properly.</string> - <string name="swipe_to_fix_perms">Swipe to Fix Permissions</string> - <string name="swipe_fix_perms"> Fix Perms</string> - <string name="fixing_perms">Fixing Permissions...</string> - <string name="fix_perms_complete">Fix Permissions Complete</string> + <string name="fix_contexts_hdr">Fix Contexts</string> + <string name="fix_contexts_note1">Note: Fixing contexts is rarely needed.</string> + <string name="fix_contexts_note2">Fixing SELinux Contexts may cause</string> + <string name="fix_contexts_note3">your device to not boot properly.</string> + <string name="swipe_to_fix_contexts">Swipe to Fix Contexts</string> + <string name="swipe_fix_contexts"> Fix Contexts</string> + <string name="fixing_contexts">Fixing Contexts...</string> + <string name="fix_contexts_complete">Fix Contexts Complete</string> <string name="reboot_hdr">Reboot</string> <string name="su_hdr">SuperSU Check</string> <string name="su_note1">Your device does not appear to be rooted.</string> diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml index f253b2207..8e1a0d27a 100755 --- a/gui/theme/common/portrait.xml +++ b/gui/theme/common/portrait.xml @@ -3168,9 +3168,10 @@ </button> <button style="main_button"> + <condition var1="tw_has_data_media" var2="1"/> <placement x="%center_x%" y="%row2a_y%"/> - <text>{@fix_perm_btn=Fix Permissions}</text> - <action function="page">fixperms</action> + <text>{@fix_context_btn=Fix Contexts}</text> + <action function="page">fixcontexts</action> </button> <button style="main_button"> @@ -4363,7 +4364,7 @@ </action> </page> - <page name="fixperms"> + <page name="fixcontexts"> <template name="page"/> <text style="text_l"> @@ -4373,37 +4374,31 @@ <text style="text_m"> <placement x="%col1_x_header%" y="%row4_header_y%"/> - <text>{@fix_perms_hdr=Fix Permissions}</text> + <text>{@fix_contexts_hdr=Fix Contexts}</text> </text> <text style="text_m_accent"> <placement x="%center_x%" y="%row2_y%" placement="5"/> - <text>{@fix_perms_note=Note: Fixing permissions is rarely needed.}</text> + <text>{@fix_contexts_note1=Note: Fixing contexts is rarely needed.}</text> </text> - <checkbox> - <placement x="%indent%" y="%row4_y%"/> - <text>{@fix_perms_selinux_chk=Also fix SELinux Contexts}</text> - <data variable="tw_fixperms_restorecon"/> - </checkbox> - <text style="text_m_fail"> <placement x="%center_x%" y="%row6_y%" placement="5"/> - <text>{@fix_perms_sel_note1=Fixing SELinux Contexts may cause}</text> + <text>{@fix_contexts_note2=Fixing SELinux Contexts may cause}</text> </text> <text style="text_m_fail"> <placement x="%center_x%" y="%row7_y%" placement="5"/> - <text>{@fix_perms_sel_note2=your device to not boot properly.}</text> + <text>{@fix_contexts_note3=your device to not boot properly.}</text> </text> <slider> - <text>{@swipe_to_fix_perms=Swipe to Fix Permissions}</text> + <text>{@swipe_to_fix_contexts=Swipe to Fix Contexts}</text> <actions> <action function="set">tw_back=advanced</action> - <action function="set">tw_action=fixpermissions</action> - <action function="set">tw_action_text1={@fixing_perms=Fixing Permissions...}</action> - <action function="set">tw_complete_text1={@fix_perms_complete=Fix Permissions Complete}</action> + <action function="set">tw_action=fixcontexts</action> + <action function="set">tw_action_text1={@fixing_contexts=Fixing Contexts...}</action> + <action function="set">tw_complete_text1={@fix_contexts_complete=Fix Contexts Complete}</action> <action function="set">tw_slider_text={@swipe_to_confirm=Swipe to Confirm}</action> <action function="set">tw_show_reboot=1</action> <action function="page">action_page</action> diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml index 22cc02bc6..e840687c5 100755 --- a/gui/theme/common/watch.xml +++ b/gui/theme/common/watch.xml @@ -3887,9 +3887,10 @@ </button> <button style="main_button"> + <condition var1="tw_has_data_media" var2="1"/> <placement x="%col1_x_right%" y="%row1_y%"/> - <text>{@fix_perm_s_btn=Fix Perms}</text> - <action function="page">fixperms</action> + <text>{@fix_context_btn=Fix Contexts}</text> + <action function="page">fixcontexts</action> </button> <button style="main_button"> @@ -5158,44 +5159,38 @@ </action> </page> - <page name="fixperms"> + <page name="fixcontexts"> <template name="page"/> <template name="statusbar"/> <text style="text_m"> <placement x="%col1_x_left%" y="%row1_header_y%"/> - <text>{@advanced_hdr=Advanced} > {@fix_perms_hdr=Fix Permissions}</text> + <text>{@advanced_hdr=Advanced} > {@fix_contexts_hdr=Fix Contexts}</text> </text> <text style="text_m_accent"> <placement x="%center_x%" y="%row2_y%" placement="5"/> - <text>{@fix_perms_note=Note: Fixing permissions is rarely needed.}</text> + <text>{@fix_contexts_note1=Note: Fixing contexts is rarely needed.}</text> </text> - <checkbox> - <placement x="%indent%" y="%row4_y%"/> - <text>{@fix_perms_selinux_chk=Also fix SELinux Contexts}</text> - <data variable="tw_fixperms_restorecon"/> - </checkbox> - <text style="text_m_fail"> <placement x="%center_x%" y="%row6a_y%" placement="5"/> - <text>{@fix_perms_sel_note1=Fixing SELinux Contexts may cause}</text> + <text>{@fix_contexts_note2=Fixing SELinux Contexts may cause}</text> </text> <text style="text_m_fail"> <placement x="%center_x%" y="%row7a_y%" placement="5"/> - <text>{@fix_perms_sel_note2=your device to not boot properly.}</text> + <text>{@fix_contexts_note3=your device to not boot properly.}</text> </text> <slider> - <text>{@swipe_fix_perms= Fix Perms}</text> + <text>{@swipe_fix_contexts= Fix Contexts}</text> <actions> <action function="set">tw_back=advanced</action> - <action function="set">tw_action=fixpermissions</action> - <action function="set">tw_action_text1={@fixing_perms=Fixing Permissions...}</action> - <action function="set">tw_complete_text1={@fix_perms_complete=Fix Permissions Complete}</action> + <action function="set">tw_action=fixcontexts</action> + <action function="set">tw_action_text1={@fixing_contexts=Fixing Contexts...}</action> + <action function="set">tw_complete_text1={@fix_contexts_complete=Fix Contexts Complete}</action> <action function="set">tw_slider_text={@swipe_confirm= Confirm}</action> <action function="set">tw_show_reboot=1</action> <action function="page">action_page</action> |