Allow non datamedia devices to wipe encryption
With 5.0 L, we decrypt automatically if the default_password is
used. Non datamedia devices do not get the format data button so
they cannot wipe encryption off the device. This patch add a wipe
encryption button where the format data button would normally be
located on the Wipe page.
This patch also attempts to remove / delete the dm-crypt block
device before formatting.
Change-Id: I100d5d154d6c49254fd48e23279df973db5f23ae
diff --git a/gui/devices/portrait/res/portrait.xml b/gui/devices/portrait/res/portrait.xml
index 9a95710..a7fbbf4 100644
--- a/gui/devices/portrait/res/portrait.xml
+++ b/gui/devices/portrait/res/portrait.xml
@@ -769,10 +769,7 @@
</object>
<object type="button">
- <conditions>
- <condition var1="tw_has_internal" var2="1" />
- <condition var1="tw_has_data_media" var2="1" />
- </conditions>
+ <condition var1="tw_has_data_media" var2="1" />
<highlight color="%highlight_color%" />
<placement x="%col2_x%" y="%wipe_button_y%" />
<font resource="font" color="%button_text_color%" />
@@ -783,6 +780,30 @@
</actions>
</object>
+ <object type="button">
+ <conditions>
+ <condition var1="tw_is_encrypted" var2="1" />
+ <condition var1="tw_has_data_media" var2="0" />
+ </conditions>
+ <highlight color="%highlight_color%" />
+ <placement x="%col2_x%" y="%wipe_button_y%" />
+ <font resource="font" color="%button_text_color%" />
+ <text>Wipe Encryption</text>
+ <image resource="main_button" />
+ <actions>
+ <action function="set">tw_back=wipe</action>
+ <action function="set">tw_action=wipe</action>
+ <action function="set">tw_action_param=DATAMEDIA</action>
+ <action function="set">tw_has_action2=0</action>
+ <action function="set">tw_text1=Wipe Encryption from Data?</action>
+ <action function="set">tw_text2=</action>
+ <action function="set">tw_action_text1=Formatting Data...</action>
+ <action function="set">tw_complete_text1=Data Format Complete</action>
+ <action function="set">tw_slider_text=Swipe to Format Data</action>
+ <action function="page">confirm_action</action>
+ </actions>
+ </object>
+
<object type="slider">
<placement x="%slider_x%" y="%slider_y%" />
<resource base="slider" used="slider-used" touch="slider-touch" />