Fix placement of Android Secure and SD-EXT on wipe page
Change-Id: Iac1c13b38df2ac66106abcda7c9d171a1549b65f
diff --git a/gui/devices/landscape/res/landscape.xml b/gui/devices/landscape/res/landscape.xml
index d0012c0..cee7c15 100644
--- a/gui/devices/landscape/res/landscape.xml
+++ b/gui/devices/landscape/res/landscape.xml
@@ -1018,16 +1018,6 @@
</object>
<object type="text" color="%text_color%">
- <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>.android_secure</text>
- </object>
-
- <object type="text" color="%text_color%">
<condition var1="tw_has_data_media" var2="1" />
<font resource="font" />
<placement x="%center_x%" y="%row2_text_y%" placement="5" />
@@ -1035,10 +1025,20 @@
</object>
<object type="text" color="%text_color%">
+ <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="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
index 8d749c1..9a95710 100644
--- a/gui/devices/portrait/res/portrait.xml
+++ b/gui/devices/portrait/res/portrait.xml
@@ -715,16 +715,6 @@
</object>
<object type="text" color="%text_color%">
- <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>.android_secure</text>
- </object>
-
- <object type="text" color="%text_color%">
<condition var1="tw_has_data_media" var2="1" />
<font resource="font" />
<placement x="%center_x%" y="%row3_text_y%" placement="5" />
@@ -732,21 +722,31 @@
</object>
<object type="text" color="%text_color%">
- <condition var1="tw_has_sdext_partition" 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="%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="%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
index 26cf2d5..d3ddc54 100644
--- a/gui/devices/watch/res/watch.xml
+++ b/gui/devices/watch/res/watch.xml
@@ -658,16 +658,6 @@
</object>
<object type="text" color="%text_color%">
- <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>.android_secure</text>
- </object>
-
- <object type="text" color="%text_color%">
<condition var1="tw_has_data_media" var2="1" />
<font resource="font" />
<placement x="%center_x%" y="%row3_text_y%" placement="5" />
@@ -675,10 +665,20 @@
</object>
<object type="text" color="%text_color%">
+ <conditions>
+ <condition var1="tw_has_android_secure" var2="1" />
+ <condition var1="fileexists" var2="/and-sec" />
+ </conditions>
+ <font resource="font" />
+ <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%">