From a7f5ce31da308fb014655271757d08e6e8f01305 Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Fri, 10 Oct 2014 09:33:20 -0400
Subject: Fix placement of Android Secure and SD-EXT on wipe page

Change-Id: Iac1c13b38df2ac66106abcda7c9d171a1549b65f
---
 gui/devices/portrait/res/portrait.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'gui/devices/portrait')

diff --git a/gui/devices/portrait/res/portrait.xml b/gui/devices/portrait/res/portrait.xml
index 8d749c126..9a9571012 100644
--- a/gui/devices/portrait/res/portrait.xml
+++ b/gui/devices/portrait/res/portrait.xml
@@ -715,38 +715,38 @@
 			</object>
 
 			<object type="text" color="%text_color%">
-				<conditions>
-					<condition var1="tw_has_android_secure" var2="1" />
-					<condition var1="fileexists" var2="/and-sec" />
-				</conditions>
+				<condition var1="tw_has_data_media" var2="1" />
 				<font resource="font" />
 				<placement x="%center_x%" y="%row3_text_y%" placement="5" />
-				<text>.android_secure</text>
+				<text>(not including internal storage)</text>
 			</object>
 
 			<object type="text" color="%text_color%">
-				<condition var1="tw_has_data_media" var2="1" />
+				<conditions>
+					<condition var1="tw_has_android_secure" var2="1" />
+					<condition var1="fileexists" var2="/and-sec" />
+				</conditions>
 				<font resource="font" />
-				<placement x="%center_x%" y="%row3_text_y%" placement="5" />
-				<text>(not including internal storage)</text>
+				<placement x="%center_x%" y="%row4_text_y%" placement="5" />
+				<text>Android Secure</text>
 			</object>
 
 			<object type="text" color="%text_color%">
 				<condition var1="tw_has_sdext_partition" var2="1" />
 				<font resource="font" />
-				<placement x="%center_x%" y="%row4_text_y%" placement="5" />
+				<placement x="%center_x%" y="%row5_text_y%" placement="5" />
 				<text>SD-EXT</text>
 			</object>
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="%center_x%" y="%row5_text_y%" placement="5" />
+				<placement x="%center_x%" y="%row6_text_y%" placement="5" />
 				<text>Most of the time this is</text>
 			</object>
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="%center_x%" y="%row6_text_y%" placement="5" />
+				<placement x="%center_x%" y="%row7_text_y%" placement="5" />
 				<text>the only wipe that you need.</text>
 			</object>
 
-- 
cgit v1.2.3