Normalized digest check before installing zip
Change-Id: I5a3e82f103e7a80800be7790f1c8dc33c76413da
(cherry picked from commit 646f4f0c66a918f12e12784b22e7dc9a89837c37)
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index c12cbf8..165f329 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -176,6 +176,15 @@
<font resource="font_m" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%accent_color%"/>
</style>
+ <style name="options_listbox">
+ <highlight color="%fileselector_highlight_color%"/>
+ <fastscroll linecolor="%fileselector_linecolor%" rectcolor="%accent_color%" w="%fastscroll_w%" linew="%fastscroll_linew%" rectw="%fastscroll_rectw%" recth="%fastscroll_recth%"/>
+ <separator color="%background_color%" height="%fileselector_separatorheight%"/>
+ <dimensions lineh="%slidervalue_lineh%" linepadding="%slidervalue_padding%" sliderw="%slidervalue_sliderw%" sliderh="%slidervalue_sliderh%"/>
+ <background color="%background_color%"/>
+ <font resource="font_m" spacing="%fileselector_spacing%" color="%text_color%" highlightcolor="%accent_color%"/>
+ </style>
+
<style name="slider">
<placement x="%center_x%" y="%slider_y%"/>
<font resource="font_l" color="%text_color%"/>
@@ -550,24 +559,23 @@
<text>{@install_zip_hdr=Install Zip} > {@options_hdr=Options}</text>
</text>
- <checkbox>
- <placement x="%indent%" y="%row1_y%"/>
- <text>{@zip_sig_chk=Zip file signature verification}</text>
- <data variable="tw_signed_zip_verify"/>
- </checkbox>
-
- <checkbox>
- <condition var1="tw_has_injecttwrp" var2="1"/>
- <placement x="%indent%" y="%row2a_y%"/>
- <text>{@inject_twrp_chk=Inject TWRP after install}</text>
- <data variable="tw_inject_after_zip"/>
- </checkbox>
-
- <checkbox>
- <placement x="%indent%" y="%row4_y%"/>
- <text>{@install_reboot_chk=Reboot after installation is complete}</text>
- <data variable="tw_install_reboot"/>
- </checkbox>
+ <listbox style="options_listbox">
+ <placement x="%indent%" y="%row1_y%" w="%content_width%" h="%listbox_options_height%"/>
+ <icon selected="checkbox_true" unselected="checkbox_false"/>
+ <listitem name="{@zip_sig_chk=Zip signature verification}">
+ <data variable="tw_signed_zip_verify"/>
+ </listitem>
+ <listitem name="{@skip_digest_zip_chk=Skip Digest check before installing zip}">
+ <data variable="tw_skip_digest_check_zip"/>
+ </listitem>
+ <listitem name="{@install_reboot_chk=Reboot after installation is complete}">
+ <data variable="tw_install_reboot"/>
+ </listitem>
+ <listitem name="{@inject_twrp_chk=Inject TWRP after install}">
+ <condition var1="tw_has_injecttwrp" var2="1"/>
+ <data variable="tw_inject_after_zip"/>
+ </listitem>
+ </listbox>
<button>
<placement x="%col1_x_left%" y="%row11_y%"/>
@@ -3738,6 +3746,9 @@
<listitem name="{@restore_enable_digest_chk=Enable Digest verification of backup files}">
<data variable="tw_skip_digest_check"/>
</listitem>
+ <listitem name="{@skip_digest_zip_chk=Skip Digest check before installing zip}">
+ <data variable="tw_skip_digest_check_zip"/>
+ </listitem>
<listitem name="{@use24clock_chk=Use 24-hour clock}">
<data variable="tw_military_time"/>
</listitem>