Remove duplicate Update_System_Details() function calls
Only run Update_System_Details on boot after decryption is
complete, if device is unencrypted, or if decryption prompt
is cancelled.
This significantly decreases the delay in reaching the
decryption prompt on devices with large used storage
capacity
Use refreshsizes action to update system details when
Cancel button is pressed at decryption prompt
Change-Id: I9e436b1c57664a5269f42dc1cda4f6097f7e3062
diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index a3437fb..cf14ace 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -4715,10 +4715,7 @@
<button style="main_button_half_width_low">
<placement x="%indent%" y="%row6_y%"/>
<text>{@cancel_btn=Cancel}</text>
- <actions>
- <action function="set">tw_page_done=1</action>
- <action function="page">main</action>
- </actions>
+ <action function="page">canceldecrypt</action>
</button>
<button style="main_button_half_width_low">
@@ -4795,10 +4792,7 @@
<button style="main_button_half_width">
<placement x="%col2_x_right%" y="%row15a_y%"/>
<text>{@cancel_btn=Cancel}</text>
- <actions>
- <action function="set">tw_page_done=1</action>
- <action function="page">main</action>
- </actions>
+ <action function="page">canceldecrypt</action>
</button>
</page>
@@ -4846,6 +4840,38 @@
</action>
</page>
+ <page name="canceldecrypt">
+ <template name="page"/>
+
+ <text style="text_l">
+ <placement x="%col1_x_header%" y="%row3_header_y%"/>
+ <text>{@cancel_btn=Cancel}</text>
+ </text>
+
+ <text style="text_m">
+ <placement x="%col1_x_header%" y="%row4_header_y%"/>
+ <text>{@refresh_sizes_btn=Refresh Sizes}</text>
+ </text>
+
+ <template name="console"/>
+
+ <template name="progress_bar"/>
+
+ <action>
+ <action function="refreshsizes"/>
+ </action>
+
+ <action>
+ <conditions>
+ <condition var1="tw_operation_state" var2="1"/>
+ </conditions>
+ <actions>
+ <action function="set">tw_page_done=1</action>
+ <action function="page">main</action>
+ </actions>
+ </action>
+ </page>
+
<page name="terminalcommand">
<template name="page"/>