Merge "SHA2: Enable in landscape and watch xml" into android-7.1

2017-08-13 01:51:57 +02:00
parent 1a230e461c 1c01fabf87
commit 5302ec42b7
2 changed files with 8 additions and 0 deletions
@@ -2886,6 +2886,10 @@
 					<condition var1="tw_simulate_actions" var2="1"/>
 					<data variable="tw_simulate_fail"/>
 				</listitem>
+				<listitem name="{@sha2_chk=Use SHA2 for hashing}">
+					<condition var1="tw_no_sha2" var2="0"/>
+					<data variable="tw_use_sha2"/>
+				</listitem>
 			</listbox>

 			<checkbox>
@@ -3604,6 +3604,10 @@
 					<data variable="tw_simulate_fail"/>
 					<condition var1="tw_simulate_actions" var2="1"/>
 				</listitem>
+				<listitem name="{@sha2_chk=Use SHA2 for hashing}">
+					<condition var1="tw_no_sha2" var2="0"/>
+					<data variable="tw_use_sha2"/>
+				</listitem>
 			</listbox>

 			<action>