12 files changed, 175 insertions, 122 deletions

diff --git a/gui/devices/1024x600/res/ui.xml b/gui/devices/1024x600/res/ui.xml
index 383774e12..a651b5bf3 100755
--- a/gui/devices/1024x600/res/ui.xml
+++ b/gui/devices/1024x600/res/ui.xml
@@ -2460,8 +2460,8 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row6_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Ignore image size errors during backup</text>
-				<data variable="tw_ignore_image_size" />
+				<text>Use Military Time</text>
+				<data variable="tw_military_time" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
@@ -2482,14 +2482,6 @@
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
-                        <object type="checkbox">
-                                <placement x="%col1_x%" y="%row9_text_y%" />
-                                <font resource="font" color="%text_color%" />
-                                <text>Use Military Time</text>
-                                <data variable="tw_military_time" />
-                                <image checked="checkbox_true" unchecked="checkbox_false" />
-                        </object>
-
 			<object type="button">
 				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row2_y%" />
diff --git a/gui/devices/1024x768/res/ui.xml b/gui/devices/1024x768/res/ui.xml
index 6395c7443..f4cfa44bf 100644
--- a/gui/devices/1024x768/res/ui.xml
+++ b/gui/devices/1024x768/res/ui.xml
@@ -2460,8 +2460,8 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row6_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Ignore image size errors during backup</text>
-				<data variable="tw_ignore_image_size" />
+				<text>Use Military Time</text>
+				<data variable="tw_military_time" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
@@ -2482,14 +2482,6 @@
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
-                        <object type="checkbox">
-                                <placement x="%col1_x%" y="%row9_text_y%" />
-                                <font resource="font" color="%text_color%" />
-                                <text>Use Military Time</text>
-                                <data variable="tw_military_time" />
-                                <image checked="checkbox_true" unchecked="checkbox_false" />
-                        </object>
-
 			<object type="button">
 				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row2_y%" />
diff --git a/gui/devices/1280x800/res/ui.xml b/gui/devices/1280x800/res/ui.xml
index c806b8517..e6ef8f961 100644
--- a/gui/devices/1280x800/res/ui.xml
+++ b/gui/devices/1280x800/res/ui.xml
@@ -2460,8 +2460,8 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row6_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Ignore image size errors during backup</text>
-				<data variable="tw_ignore_image_size" />
+				<text>Use Military Time</text>
+				<data variable="tw_military_time" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
@@ -2482,14 +2482,6 @@
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
-                        <object type="checkbox">
-                                <placement x="%col1_x%" y="%row9_text_y%" />
-                                <font resource="font" color="%text_color%" />
-                                <text>Use Military Time</text>
-                                <data variable="tw_military_time" />
-                                <image checked="checkbox_true" unchecked="checkbox_false" />
-                        </object>
-
 			<object type="button">
 				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row2_y%" />
diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml
index 1947ffa69..e22494bea 100644
--- a/gui/devices/1920x1200/res/ui.xml
+++ b/gui/devices/1920x1200/res/ui.xml
@@ -2460,8 +2460,8 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row6_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Ignore image size errors during backup</text>
-				<data variable="tw_ignore_image_size" />
+				<text>Use Military Time</text>
+				<data variable="tw_military_time" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
@@ -2482,15 +2482,6 @@
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
-
-                        <object type="checkbox">
-                                <placement x="%col1_x%" y="%row9_text_y%" />
-                                <font resource="font" color="%text_color%" />
-                                <text>Use Military Time</text>
-                                <data variable="tw_military_time" />
-                                <image checked="checkbox_true" unchecked="checkbox_false" />
-                        </object>
-
 			<object type="button">
 				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row2_y%" />
diff --git a/gui/devices/2560x1600/res/ui.xml b/gui/devices/2560x1600/res/ui.xml
index e26bdb902..d3b20abd7 100644
--- a/gui/devices/2560x1600/res/ui.xml
+++ b/gui/devices/2560x1600/res/ui.xml
@@ -2460,8 +2460,8 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row6_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Ignore image size errors during backup</text>
-				<data variable="tw_ignore_image_size" />
+				<text>Use Military Time</text>
+				<data variable="tw_military_time" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
@@ -2482,14 +2482,6 @@
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
-                        <object type="checkbox">
-                                <placement x="%col1_x%" y="%row9_text_y%" />
-                                <font resource="font" color="%text_color%" />
-                                <text>Use Military Time</text>
-                                <data variable="tw_military_time" />
-                                <image checked="checkbox_true" unchecked="checkbox_false" />
-                        </object>
-
 			<object type="button">
 				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row2_y%" />
diff --git a/gui/devices/320x480/res/ui.xml b/gui/devices/320x480/res/ui.xml
index 58147d2aa..9f2051d2b 100644
--- a/gui/devices/320x480/res/ui.xml
+++ b/gui/devices/320x480/res/ui.xml
@@ -2432,8 +2432,8 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row5_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Ignore image size errors during backup.</text>
-				<data variable="tw_ignore_image_size" />
+				<text>Use Military Time.</text>
+				<data variable="tw_military_time" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
@@ -2454,14 +2454,6 @@
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
-                        <object type="checkbox">
-                                <placement x="%col1_x%" y="%row8_text_y%" />
-                                <font resource="font" color="%text_color%" />
-                                <text>Use Military Time</text>
-                                <data variable="tw_military_time" />
-                                <image checked="checkbox_true" unchecked="checkbox_false" />
-                        </object>
-
 			<object type="button">
 				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row3_y%" />
diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml
index 572d1b92b..2707b24ca 100644
--- a/gui/devices/480x800/res/ui.xml
+++ b/gui/devices/480x800/res/ui.xml
@@ -2431,8 +2431,8 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row5_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Ignore image size errors during backup.</text>
-				<data variable="tw_ignore_image_size" />
+				<text>Use Military Time.</text>
+				<data variable="tw_military_time" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
@@ -2453,14 +2453,6 @@
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
-                        <object type="checkbox">
-                                <placement x="%col1_x%" y="%row8_text_y%" />
-                                <font resource="font" color="%text_color%" />
-                                <text>Use Military Time</text>
-                                <data variable="tw_military_time" />
-                                <image checked="checkbox_true" unchecked="checkbox_false" />
-                        </object>
-
 			<object type="button">
 				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row3_y%" />
diff --git a/gui/devices/480x854/res/ui.xml b/gui/devices/480x854/res/ui.xml
index 09df8037c..44cd78232 100644
--- a/gui/devices/480x854/res/ui.xml
+++ b/gui/devices/480x854/res/ui.xml
@@ -2430,8 +2430,8 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row5_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Ignore image size errors during backup.</text>
-				<data variable="tw_ignore_image_size" />
+				<text>Use Military Time.</text>
+				<data variable="tw_military_time" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
@@ -2452,14 +2452,6 @@
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
-                        <object type="checkbox">
-                                <placement x="%col1_x%" y="%row8_text_y%" />
-                                <font resource="font" color="%text_color%" />
-                                <text>Use Military Time</text>
-                                <data variable="tw_military_time" />
-                                <image checked="checkbox_true" unchecked="checkbox_false" />
-                        </object>
-
 			<object type="button">
 				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row3_y%" />
diff --git a/gui/devices/540x960/res/ui.xml b/gui/devices/540x960/res/ui.xml
index 9e8034bf1..ae0b24e33 100644
--- a/gui/devices/540x960/res/ui.xml
+++ b/gui/devices/540x960/res/ui.xml
@@ -937,6 +937,48 @@
 			</object>
 		</page>
 
+		<page name="singleaction_page">
+			<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>%tw_action_text1%</text>
+			</object>
+
+			<object type="text" color="%text_color%">
+				<font resource="font" />
+				<placement x="%center_x%" y="%row3_text_y%" placement="5" />
+				<text>%tw_action_text2%</text>
+			</object>
+
+			<object type="template" name="action_page_console" />
+
+			<object type="template" name="progress_bar" />
+
+			<object type="action">
+				<condition var1="tw_operation_state" var2="1" />
+				<actions>
+					<action function="set">tw_page_done=1</action>
+				</actions>
+			</object>
+
+			<object type="action">
+				<condition var1="tw_has_action2" var2="0" />
+				<actions>
+					<action function="%tw_action%">%tw_action_param%</action>
+				</actions>
+			</object>
+
+			<object type="action">
+				<condition var1="tw_has_action2" var2="1" />
+				<actions>
+					<action function="%tw_action%">%tw_action_param%</action>
+					<action function="%tw_action2%">%tw_action2_param%</action>
+				</actions>
+			</object>
+		</page>
+
 		<page name="action_complete">
 			<object type="template" name="header" />
 
@@ -2389,8 +2431,8 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row5_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Ignore image size errors during backup.</text>
-				<data variable="tw_ignore_image_size" />
+				<text>Use Military Time.</text>
+				<data variable="tw_military_time" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
@@ -2411,14 +2453,6 @@
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
-                        <object type="checkbox">
-                                <placement x="%col1_x%" y="%row8_text_y%" />
-                                <font resource="font" color="%text_color%" />
-                                <text>Use Military Time</text>
-                                <data variable="tw_military_time" />
-                                <image checked="checkbox_true" unchecked="checkbox_false" />
-                        </object>
-
 			<object type="button">
 				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row3_y%" />
@@ -3829,5 +3863,113 @@
 
 			<object type="template" name="footer" />
 		</page>
+
+		<page name="installsu">
+			<object type="template" name="header" />
+
+			<object type="text" color="%text_color%">
+				<font resource="font" />
+				<placement x="%center_x%" y="%row1_header_y%" placement="5"/>
+				<text>Install SuperSU?</text>
+			</object>
+
+			<object type="text" color="%text_color%">
+				<font resource="font" />
+				<placement x="%center_x%" y="%row2_text_y%" placement="5"/>
+				<text>Your device does not appear to be rooted.</text>
+			</object>
+
+			<object type="text" color="%text_color%">
+				<font resource="font" />
+				<placement x="%center_x%" y="%row3_text_y%" placement="5"/>
+				<text>Install SuperSU now?</text>
+			</object>
+
+			<object type="text" color="%text_color%">
+				<font resource="font" />
+				<placement x="%center_x%" y="%row4_text_y%" placement="5"/>
+				<text>This will root your device.</text>
+			</object>
+
+			<object type="button">
+				<highlight color="%highlight_color%" />
+				<placement x="%col_center_x%" y="%row3_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>Do Not Install</text>
+				<image resource="main_button" />
+				<action function="set">tw_page_done=1</action>
+			</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_action=installsu</action>
+					<action function="set">tw_action_text1=Installing SuperSU</action>
+					<action function="set">tw_action_text2=</action>
+					<action function="page">singleaction_page</action>
+				</actions>
+			</object>
+
+			<object type="text" color="%text_color%">
+				<font resource="font" />
+				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
+				<text>Swipe to Install</text>
+			</object>
+		</page>
+
+		<page name="fixsu">
+			<object type="template" name="header" />
+
+			<object type="text" color="%text_color%">
+				<font resource="font" />
+				<placement x="%center_x%" y="%row1_header_y%" placement="5"/>
+				<text>Fix Superuser Permissions?</text>
+			</object>
+
+			<object type="text" color="%text_color%">
+				<font resource="font" />
+				<placement x="%center_x%" y="%row2_text_y%" placement="5"/>
+				<text>Root permissions appear to be lost.</text>
+			</object>
+
+			<object type="text" color="%text_color%">
+				<font resource="font" />
+				<placement x="%center_x%" y="%row3_text_y%" placement="5"/>
+				<text>Fix root permissions now?</text>
+			</object>
+
+			<object type="text" color="%text_color%">
+				<font resource="font" />
+				<placement x="%center_x%" y="%row4_text_y%" placement="5"/>
+				<text>(Fixes permissions on su binary & app)</text>
+			</object>
+
+			<object type="button">
+				<highlight color="%highlight_color%" />
+				<placement x="%col_center_x%" y="%row3_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>Do Not Fix</text>
+				<image resource="main_button" />
+				<action function="set">tw_page_done=1</action>
+			</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_action=fixsu</action>
+					<action function="set">tw_action_text1=Fixing Root Permissions</action>
+					<action function="set">tw_action_text2=</action>
+					<action function="page">singleaction_page</action>
+				</actions>
+			</object>
+
+			<object type="text" color="%text_color%">
+				<font resource="font" />
+				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
+				<text>Swipe to Fix Root</text>
+			</object>
+		</page>
 	</pages>
 </recovery>
diff --git a/gui/devices/720x1280/res/ui.xml b/gui/devices/720x1280/res/ui.xml
index 6d9f061c4..bdd779939 100644
--- a/gui/devices/720x1280/res/ui.xml
+++ b/gui/devices/720x1280/res/ui.xml
@@ -2444,8 +2444,8 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row5_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Ignore image size errors during backup.</text>
-				<data variable="tw_ignore_image_size" />
+				<text>Use Military Time.</text>
+				<data variable="tw_military_time" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
@@ -2466,14 +2466,6 @@
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
-                        <object type="checkbox">
-                                <placement x="%col1_x%" y="%row8_text_y%" />
-                                <font resource="font" color="%text_color%" />
-                                <text>Use Military Time</text>
-                                <data variable="tw_military_time" />
-                                <image checked="checkbox_true" unchecked="checkbox_false" />
-                        </object>
-
 			<object type="button">
 				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row3_y%" />
diff --git a/gui/devices/800x1280/res/ui.xml b/gui/devices/800x1280/res/ui.xml
index 03e4e7001..eb602cd7c 100755
--- a/gui/devices/800x1280/res/ui.xml
+++ b/gui/devices/800x1280/res/ui.xml
@@ -2432,8 +2432,8 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row5_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Ignore image size errors during backup.</text>
-				<data variable="tw_ignore_image_size" />
+				<text>Use Military Time.</text>
+				<data variable="tw_military_time" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
@@ -2454,14 +2454,6 @@
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
-                        <object type="checkbox">
-                                <placement x="%col1_x%" y="%row8_text_y%" />
-                                <font resource="font" color="%text_color%" />
-                                <text>Use Military Time</text>
-                                <data variable="tw_military_time" />
-                                <image checked="checkbox_true" unchecked="checkbox_false" />
-                        </object>
-
 			<object type="button">
 				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row3_y%" />
diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml
index 9501ad899..7813aa686 100755
--- a/gui/devices/800x480/res/ui.xml
+++ b/gui/devices/800x480/res/ui.xml
@@ -2468,8 +2468,8 @@
 			<object type="checkbox">
 				<placement x="%col1_x%" y="%row6_text_y%" />
 				<font resource="font" color="%text_color%" />
-				<text>Ignore image size errors during backup</text>
-				<data variable="tw_ignore_image_size" />
+				<text>Use Military Time</text>
+				<data variable="tw_military_time" />
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
@@ -2490,14 +2490,6 @@
 				<image checked="checkbox_true" unchecked="checkbox_false" />
 			</object>
 
-                        <object type="checkbox">
-                                <placement x="%col1_x%" y="%row9_text_y%" />
-                                <font resource="font" color="%text_color%" />
-                                <text>Use Military Time</text>
-                                <data variable="tw_military_time" />
-                                <image checked="checkbox_true" unchecked="checkbox_false" />
-                        </object>
-
 			<object type="button">
 				<highlight color="%highlight_color%" />
 				<placement x="%col1_x%" y="%row2_y%" />
@@ -2534,7 +2526,7 @@
 				<touch key="back" />
 				<action function="page">main</action>
 			</object>
-
+			
 			<object type="template" name="footer" />
 		</page>