From bf1d67245ebce9d63e1167920e5dec6728843b11 Mon Sep 17 00:00:00 2001
From: bigbiff <bigbiff@teamw.in>
Date: Sat, 14 Feb 2015 16:25:59 -0500
Subject: Theme: Add ability to disable size checking before backup (for
 compressed backup users with low space). Clean up backup folder and copy only
 recovery.log for debugging.

Conflicts:
	gui/devices/watch/res/watch.xml

Change-Id: If8aa3580dbc082d0fe4882d4af8dc3cdb362a8b5
---
 gui/devices/1024x600/res/ui.xml                 |   1 +
 gui/devices/1024x768/res/ui.xml                 |   1 +
 gui/devices/1280x800/res/ui.xml                 |   1 +
 gui/devices/1920x1200/res/ui.xml                |   1 +
 gui/devices/2560x1600/res/ui.xml                |   1 +
 gui/devices/320x480/res/images/slider-touch.png | Bin 4445 -> 3781 bytes
 gui/devices/320x480/res/images/slider-used.png  | Bin 1943 -> 1728 bytes
 gui/devices/320x480/res/images/slider.png       | Bin 3028 -> 2611 bytes
 gui/devices/320x480/res/ui.xml                  |   4 ++--
 gui/devices/800x480/res/ui.xml                  |   1 +
 gui/devices/landscape/res/landscape.xml         |   8 ++++++++
 gui/devices/portrait/res/portrait.xml           |   8 ++++++++
 gui/devices/watch/res/watch.xml                 |  10 +++++++++-
 13 files changed, 33 insertions(+), 3 deletions(-)

(limited to 'gui')

diff --git a/gui/devices/1024x600/res/ui.xml b/gui/devices/1024x600/res/ui.xml
index e76cc950c..725e11fcc 100644
--- a/gui/devices/1024x600/res/ui.xml
+++ b/gui/devices/1024x600/res/ui.xml
@@ -101,6 +101,7 @@
 		<variable name="nandcheck_row5" value="330" />
 		<variable name="nandcheck_row6" value="375" />
 		<variable name="nandcheck_row7" value="410" />
+		<variable name="nandcheck_row8" value="445" />
 		<variable name="button_text_color" value="#AAAAAA" />
 		<variable name="text_color" value="#A0A0A0" />
 		<variable name="text_success_color" value="#33B5E5" />
diff --git a/gui/devices/1024x768/res/ui.xml b/gui/devices/1024x768/res/ui.xml
index cfaf48e00..683be26f1 100644
--- a/gui/devices/1024x768/res/ui.xml
+++ b/gui/devices/1024x768/res/ui.xml
@@ -101,6 +101,7 @@
 		<variable name="nandcheck_row5" value="350" />
 		<variable name="nandcheck_row6" value="400" />
 		<variable name="nandcheck_row7" value="450" />
+		<variable name="nandcheck_row8" value="500" />
 		<variable name="button_text_color" value="#AAAAAA" />
 		<variable name="text_color" value="#A0A0A0" />
 		<variable name="text_success_color" value="#33B5E5" />
diff --git a/gui/devices/1280x800/res/ui.xml b/gui/devices/1280x800/res/ui.xml
index 0c7ecf0b9..ddcdb3f64 100644
--- a/gui/devices/1280x800/res/ui.xml
+++ b/gui/devices/1280x800/res/ui.xml
@@ -101,6 +101,7 @@
 		<variable name="nandcheck_row5" value="350" />
 		<variable name="nandcheck_row6" value="400" />
 		<variable name="nandcheck_row7" value="450" />
+		<variable name="nandcheck_row8" value="500" />
 		<variable name="button_text_color" value="#AAAAAA" />
 		<variable name="text_color" value="#A0A0A0" />
 		<variable name="text_success_color" value="#33B5E5" />
diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml
index 05a3ee62b..2407905bf 100644
--- a/gui/devices/1920x1200/res/ui.xml
+++ b/gui/devices/1920x1200/res/ui.xml
@@ -101,6 +101,7 @@
 		<variable name="nandcheck_row5" value="500" />
 		<variable name="nandcheck_row6" value="575" />
 		<variable name="nandcheck_row7" value="650" />
+		<variable name="nandcheck_row8" value="725" />
 		<variable name="button_text_color" value="#AAAAAA" />
 		<variable name="text_color" value="#A0A0A0" />
 		<variable name="text_success_color" value="#33B5E5" />
diff --git a/gui/devices/2560x1600/res/ui.xml b/gui/devices/2560x1600/res/ui.xml
index 57945cb77..8f699ee28 100644
--- a/gui/devices/2560x1600/res/ui.xml
+++ b/gui/devices/2560x1600/res/ui.xml
@@ -101,6 +101,7 @@
 		<variable name="nandcheck_row5" value="660" />
 		<variable name="nandcheck_row6" value="760" />
 		<variable name="nandcheck_row7" value="860" />
+		<variable name="nandcheck_row8" value="960" />
 		<variable name="button_text_color" value="#AAAAAA" />
 		<variable name="text_color" value="#A0A0A0" />
 		<variable name="text_success_color" value="#33B5E5" />
diff --git a/gui/devices/320x480/res/images/slider-touch.png b/gui/devices/320x480/res/images/slider-touch.png
index 2f36fa7cc..77cb80975 100644
Binary files a/gui/devices/320x480/res/images/slider-touch.png and b/gui/devices/320x480/res/images/slider-touch.png differ
diff --git a/gui/devices/320x480/res/images/slider-used.png b/gui/devices/320x480/res/images/slider-used.png
index 94a09f3bd..85c2f4368 100644
Binary files a/gui/devices/320x480/res/images/slider-used.png and b/gui/devices/320x480/res/images/slider-used.png differ
diff --git a/gui/devices/320x480/res/images/slider.png b/gui/devices/320x480/res/images/slider.png
index 5cbb27e2f..2d09187f4 100644
Binary files a/gui/devices/320x480/res/images/slider.png and b/gui/devices/320x480/res/images/slider.png differ
diff --git a/gui/devices/320x480/res/ui.xml b/gui/devices/320x480/res/ui.xml
index d91df4207..de2c13632 100644
--- a/gui/devices/320x480/res/ui.xml
+++ b/gui/devices/320x480/res/ui.xml
@@ -94,8 +94,8 @@
 		<variable name="row5_medium_y" value="258" />
 		<variable name="row6_medium_y" value="303" />
 		<variable name="row7_medium_y" value="348" />
-		<variable name="slider_x" value="39" />
-		<variable name="slider_y" value="400" />
+		<variable name="slider_x" value="55" />
+		<variable name="slider_y" value="410" />
 		<variable name="slider_text_y" value="425" />
 		<variable name="button_text_color" value="#AAAAAA" />
 		<variable name="text_color" value="#FFFFFF" />
diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml
index faa0878b7..5c9f07dfa 100644
--- a/gui/devices/800x480/res/ui.xml
+++ b/gui/devices/800x480/res/ui.xml
@@ -101,6 +101,7 @@
 		<variable name="nandcheck_row5" value="250" />
 		<variable name="nandcheck_row6" value="280" />
 		<variable name="nandcheck_row7" value="310" />
+		<variable name="nandcheck_row8" value="340" />
 		<variable name="button_text_color" value="#AAAAAA" />
 		<variable name="text_color" value="#A0A0A0" />
 		<variable name="text_success_color" value="#33B5E5" />
diff --git a/gui/devices/landscape/res/landscape.xml b/gui/devices/landscape/res/landscape.xml
index fd5fcfe42..c5d29966f 100644
--- a/gui/devices/landscape/res/landscape.xml
+++ b/gui/devices/landscape/res/landscape.xml
@@ -1623,6 +1623,14 @@
 				<data variable="tw_skip_md5_generate" />
 			</object>
 
+                        <object type="checkbox">
+                                <placement x="%col3_x%" y="%nandcheck_row8%" />
+                                <font resource="font" color="%text_color%" />
+                                <text>Disable Free Space Check.</text>
+                                <data variable="tw_disable_free_space" />
+                                <image checked="checkbox_true" unchecked="checkbox_false" />
+                        </object>
+
 			<object type="slider">
 				<text>Swipe to Back Up</text>
 				<actions>
diff --git a/gui/devices/portrait/res/portrait.xml b/gui/devices/portrait/res/portrait.xml
index 6fb52f300..315b5a8fd 100644
--- a/gui/devices/portrait/res/portrait.xml
+++ b/gui/devices/portrait/res/portrait.xml
@@ -1402,6 +1402,14 @@
 				<data variable="tw_skip_md5_generate" />
 			</object>
 
+			<object type="checkbox">
+				<placement x="%col1_x%" y="%row17_text_y%" />
+				<font resource="font" color="%text_color%" />
+				<text>Disable Free Space Check.</text>
+				<data variable="tw_disable_free_space" />
+				<image checked="checkbox_true" unchecked="checkbox_false" />
+			</object>
+
 			<object type="slider">
 				<text>Swipe to Back Up</text>
 				<action function="page">backup_run</action>
diff --git a/gui/devices/watch/res/watch.xml b/gui/devices/watch/res/watch.xml
index 1d4e2907f..dfbed16cd 100644
--- a/gui/devices/watch/res/watch.xml
+++ b/gui/devices/watch/res/watch.xml
@@ -1415,11 +1415,19 @@
 			</object>
 
 			<object type="checkbox">
-				<placement x="%col1_x%" y="%row4_text_y%" />
+				<placement x="%col1_x%" y="%row3_text_y%" />
 				<text>Skip MD5 generation during backup.</text>
 				<data variable="tw_skip_md5_generate" />
 			</object>
 
+                        <object type="checkbox">
+                                <placement x="%col1_x%" y="%row4_text_y%" />
+                                <font resource="font" color="%text_color%" />
+                                <text>Disable Free Space Check.</text>
+                                <data variable="tw_disable_free_space" />
+                                <image checked="checkbox_true" unchecked="checkbox_false" />
+                        </object>
+
 			<object type="action">
 				<touch key="home" />
 				<action function="page">main</action>
-- 
cgit v1.2.3