Skip to content

Commit 5302ec4

Browse files
bigbiffGerrit Code Review
authored andcommitted
Merge "SHA2: Enable in landscape and watch xml" into android-7.1
2 parents 1a230e4 + 1c01fab commit 5302ec4

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

gui/theme/common/landscape.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2886,6 +2886,10 @@
28862886
<condition var1="tw_simulate_actions" var2="1"/>
28872887
<data variable="tw_simulate_fail"/>
28882888
</listitem>
2889+
<listitem name="{@sha2_chk=Use SHA2 for hashing}">
2890+
<condition var1="tw_no_sha2" var2="0"/>
2891+
<data variable="tw_use_sha2"/>
2892+
</listitem>
28892893
</listbox>
28902894

28912895
<checkbox>

gui/theme/common/watch.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3604,6 +3604,10 @@
36043604
<data variable="tw_simulate_fail"/>
36053605
<condition var1="tw_simulate_actions" var2="1"/>
36063606
</listitem>
3607+
<listitem name="{@sha2_chk=Use SHA2 for hashing}">
3608+
<condition var1="tw_no_sha2" var2="0"/>
3609+
<data variable="tw_use_sha2"/>
3610+
</listitem>
36073611
</listbox>
36083612

36093613
<action>

0 commit comments

Comments
 (0)