PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Iac1c13b38df2ac66106abcda7c9d171a1549b65f
This commit is contained in:
Captain Throwback
2014-10-10 09:33:20 -04:00
committed by Ethan Yonker
parent 25f20c1928
commit a7f5ce31da
3 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui/devices/landscape/res/landscape.xml
+12 -12
View File
@@ -1017,16 +1017,6 @@
<text>Factory Reset: Wipes Data, Cache, and Dalvik</text>
</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" />
@@ -1034,11 +1024,21 @@
<text>(not including internal storage)</text>
</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%">
gui/devices/portrait/res/portrait.xml
+13 -13
View File
@@ -714,16 +714,6 @@
<text>Wipes Data, Cache, and Dalvik</text>
</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" />
@@ -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>
gui/devices/watch/res/watch.xml
+12 -12
View File
@@ -657,16 +657,6 @@
<text>Wipes Data, Cache, and Dalvik</text>
</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" />
@@ -674,11 +664,21 @@
<text>(not including internal storage)</text>
</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%">