PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'TeamWin/android-11' into android-11

Browse Source 
Change-Id: Id1d534cce0969c98e2b8b6484278342201dd562d
This commit is contained in:
Konsta
2022-01-12 16:55:24 +02:00
parent 88d598c8c3 e331b8a1b7
commit 438a85efcf
27 changed files with 215 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui/theme/common/landscape.xml
+24 -13
View File
@@ -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>
@@ -2233,7 +2233,7 @@
<condition var1="tw_multiuser_warning_accepted" op="!=" var2="1"/>
</conditions>
<actions>
<action function="set">tw_multiuser_warning_destination=restore</action>
<action function="set">tw_multiuser_warning_destination=restore_force</action>
<action function="page">multiuser_warning</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"/>
@@ -3746,7 +3740,7 @@
<listbox style="advanced_listbox">
<placement x="%center_x%" y="%row2_y%" w="%content_half_width%" h="%fileselector_install_height%"/>
<listitem name="{@change_twrp_folder_btn=Change TWRP folder}">
<condition var1="tw_is_encrypted" var2="0"/>
<condition var1="tw_is_decrypted" var2="1"/>
<action function="page">changeTwrpFolder</action>
</listitem>
<listitem name="{@decrypt_users=Decrypt Users}">
@@ -6109,24 +6103,24 @@ edi <conditions>
</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">
@@ -6147,6 +6141,23 @@ edi <conditions>
<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>
gui/theme/common/languages/ru.xml
+2 -2
View File
@@ -507,8 +507,8 @@
<string name="install_complete">Установка завершена</string>
<string name="unpack_error">Ошибка распаковки образа.</string>
<string name="repack_error">Ошибка перепаковки образа.</string>
<string name="modified_ramdisk_error">файлы рамдиска были изменены, неудалось создать рамдиск для установки, используйте fastboot boot twrp и попробуйте эту функцию снова или воспользуйтесь Установка рекавери в ramdisk.</string>
<string name="create_ramdisk_error">неудалось создать рамдиск для установки.</string>
<string name="modified_ramdisk_error">файлы рамдиска были изменены, не удалось создать рамдиск для установки, используйте fastboot boot twrp и попробуйте эту функцию снова или воспользуйтесь Установка рекавери в ramdisk.</string>
<string name="create_ramdisk_error">не удалось создать рамдиск для установки.</string>
<string name="unpacking_image">Распаковка {1}...</string>
<string name="repacking_image">Перепаковка {1}...</string>
<string name="repack_image_hdr">Выбор образа</string>
gui/theme/common/portrait.xml
+2 -2
View File
@@ -2395,7 +2395,7 @@
<condition var1="tw_multiuser_warning_accepted" op="!=" var2="1"/>
</conditions>
<actions>
<action function="set">tw_multiuser_warning_destination=restore</action>
<action function="set">tw_multiuser_warning_destination=restore_force</action>
<action function="page">multiuser_warning</action>
</actions>
</action>
@@ -3863,7 +3863,7 @@
<listbox style="advanced_listbox">
<placement x="%indent%" y="%row13a_y%" w="%content_width%" h="%listbox_advanced_height%"/>
<listitem name="{@change_twrp_folder_btn=Change TWRP folder}">
<condition var1="tw_is_encrypted" var2="0"/>
<condition var1="tw_is_decrypted" var2="1"/>
<action function="page">changeTwrpFolder</action>
</listitem>
<listitem name="{@decrypt_users=Decrypt Users}">
gui/theme/common/watch.xml
+7 -7
View File
@@ -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>
@@ -2746,7 +2746,7 @@
<condition var1="tw_multiuser_warning_accepted" op="!=" var2="1"/>
</conditions>
<actions>
<action function="set">tw_multiuser_warning_destination=restore</action>
<action function="set">tw_multiuser_warning_destination=restore_force</action>
<action function="page">multiuser_warning</action>
</actions>
</action>
@@ -4354,7 +4354,7 @@
<listbox style="advanced_listbox">
<placement x="%indent%" y="%row2_header_y%" w="%content_width%" h="%fileselector_install_height%"/>
<listitem name="{@change_twrp_folder_btn=Change TWRP folder}">
<condition var1="tw_is_encrypted" var2="0"/>
<condition var1="tw_is_decrypted" var2="1"/>
<action function="page">changeTwrpFolder</action>
</listitem>
<listitem name="{@decrypt_users=Decrypt Users}">
@@ -6207,22 +6207,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"/>