Fix placement of Android Secure and SD-EXT on wipe page

Change-Id: Iac1c13b38df2ac66106abcda7c9d171a1549b65f
mdmower · Oct 20, 2014 · a7f5ce3 · a7f5ce3
1 parent 25f20c1
commit a7f5ce3
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 31 deletions.
diff --git a/gui/devices/landscape/res/landscape.xml b/gui/devices/landscape/res/landscape.xml
@@ -1018,27 +1018,27 @@
 			</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="%row2_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="%row2_text_y%" placement="5" />
-				<text>(not including internal storage)</text>
+				<placement x="%center_x%" y="%row3_text_y%" placement="1" />
+				<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="%row3_text_y%" placement="5" />
-				<text>SD-EXT</text>
+				<placement x="%center_x%" y="%row3_text_y%" />
+				<text>  SD-EXT</text>
 			</object>
 
 			<object type="text" color="%text_color%">

diff --git 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>
 

diff --git a/gui/devices/watch/res/watch.xml b/gui/devices/watch/res/watch.xml
@@ -658,27 +658,27 @@
 			</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="%col2_x%" y="%row4_text_y%" placement="1" />
+				<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" />
-				<text>SD-EXT</text>
+				<placement x="%col2_x%" y="%row4_text_y%" />
+				<text>  SD-EXT</text>
 			</object>
 
 			<object type="text" color="%text_color%">