gui: fix restore_keymaster page in landscape and watch themes
Change-Id: If182e7fc7c50b063542c9a4a058a599f05c8e685
diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 4b09ede..9fb8570 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -2199,7 +2199,7 @@
<action>
<condition var1="tw_crypto_pwtype" op="!=" var2="0"/>
<actions>
- <action function="page">restore_pin</action>
+ <action function="page">restore_keymaster</action>
</actions>
</action>
@@ -2267,12 +2267,6 @@
<action function="overlay">select_storage</action>
</actions>
</button>
- <action>
- <condition var1="tw_crypto_pwtype" op="!=" var2="0"/>
- <actions>
- <action function="page">restore_pin</action>
- </actions>
- </action>
<action>
<condition var1="tw_restore" op="modified"/>
@@ -6108,24 +6102,24 @@
</action>
</page>
- <page name="restore_pin">
+ <page name="restore_keymaster">
<template name="page"/>
<text style="text_m_accent">
<condition var1="tw_crypto_pwtype" var2="1"/>
<placement x="%col1_x_header%" y="%row3_header_y%"/>
- <text>{@restore_with_pin1=PIN/Password is enabled}</text>
+ <text>{@restore_with_pin_password1=PIN/Password is enabled}</text>
</text>
<text style="text_m_accent">
<condition var1="tw_crypto_pwtype" var2="1"/>
<placement x="%col1_x_header%" y="%row4_header_y%"/>
- <text>{@restore_with_pin2=PIN/Password should be disabled before restore}</text>
+ <text>{@restore_with_pin_password2=PIN/Password should be disabled before restore}</text>
</text>
<text style="text_l">
<condition var1="tw_crypto_pwtype" var2="1"/>
<placement x="%center_x%" y="%row2_y%" placement="5"/>
- <text>{@restore_pin=Restore While PIN/Password Enabled?}</text>
+ <text>{@restore_pin_password=Restore While PIN/Password Enabled?}</text>
</text>
<text style="text_m_accent">
@@ -6146,6 +6140,23 @@
<text>{@restore_pattern=Restore While Pattern Enabled?}</text>
</text>
+ <text style="text_m_accent">
+ <condition var1="tw_crypto_pwtype" var2="3"/>
+ <placement x="%col1_x_header%" y="%row3_header_y%"/>
+ <text>{@restore_with_pin1=PIN is enabled}</text>
+ </text>
+
+ <text style="text_m_accent">
+ <condition var1="tw_crypto_pwtype" var2="3"/>
+ <placement x="%col1_x_header%" y="%row4_header_y%"/>
+ <text>{@restore_with_pin2=PIN should be disabled before restore}</text>
+ </text>
+ <text style="text_l">
+ <condition var1="tw_crypto_pwtype" var2="3"/>
+ <placement x="%center_x%" y="%row2_y%" placement="5"/>
+ <text>{@restore_pin=Restore While PIN Enabled?}</text>
+ </text>
+
<slider>
<text>{@continue_restore_encrypted=Continue Restore?}</text>
<actions>
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index 335a31d..f82c2d8 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -2712,7 +2712,7 @@
<action>
<condition var1="tw_crypto_pwtype" op="!=" var2="0"/>
<actions>
- <action function="page">restore_pin</action>
+ <action function="page">restore_keymaster</action>
</actions>
</action>
@@ -6206,22 +6206,22 @@
</action>
</page>
- <page name="restore_pin">
+ <page name="restore_keymaster">
<template name="page"/>
<text style="text_m_accent">
<condition var1="tw_crypto_pwtype" var2="1"/>
<placement x="%center_x%" y="%row1_y%" placement="5"/>
- <text>{@restore_with_pin1=PIN/Password is enabled}</text>
+ <text>{@restore_with_pin_password1=PIN/Password is enabled}</text>
</text>
<text style="text_m_accent">
<condition var1="tw_crypto_pwtype" var2="1"/>
<placement x="%center_x%" y="%row2_y%" placement="5"/>
- <text>{@restore_with_pin2=PIN/Password should be disabled before restore}</text>
+ <text>{@restore_with_pin_password2=PIN/Password should be disabled before restore}</text>
</text>
<text style="text_l">
<condition var1="tw_crypto_pwtype" var2="1"/>
<placement x="%center_x%" y="%row3_y%" placement="5"/>
- <text>{@restore_pin=Restore While PIN/Password Enabled?}</text>
+ <text>{@restore_pin_password=Restore While PIN/Password Enabled?}</text>
</text>
<text style="text_m_accent">
<condition var1="tw_crypto_pwtype" var2="2"/>