From c2716f436100d5e4f8093d60dfd91e4cf3bcde23 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Wed, 6 Apr 2022 22:16:17 +0000 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: Ib8ad53b541a4cedc6a3d69f14862e452de18d80e --- tools/recovery_l10n/res/values-te/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/recovery_l10n/res/values-te/strings.xml b/tools/recovery_l10n/res/values-te/strings.xml index ecea4329..38ca6127 100644 --- a/tools/recovery_l10n/res/values-te/strings.xml +++ b/tools/recovery_l10n/res/values-te/strings.xml @@ -4,7 +4,7 @@ "సిస్టమ్ అప్‌డేట్‌ను ఇన్‍స్టాల్ చేస్తోంది" "డేటాను తొలగిస్తోంది" "ఆదేశం లేదు" - "ఎర్రర్ సంభవించింది!" + "ఎర్రర్ ఏర్పడింది!" "సెక్యూరిటీ అప్‌డేట్‌ను ఇన్‌స్టాల్ చేస్తోంది" "Android సిస్టమ్‌ని లోడ్ చేయడం సాధ్యం కాదు. మీ డేటా పాడై ఉండవచ్చు. మీకు ఈ మెసేజ్‌ వస్తూనే ఉంటే, మీరు ఫ్యాక్టరీ డేటా రీసెట్ చేసి, పరికరంలో నిల్వ అయిన వినియోగదారు డేటా మొత్తాన్ని తొలగించాల్సి రావచ్చు." "మళ్లీ ప్రయత్నించు" -- cgit v1.2.3 From d895161595e483a4092049c574e58ebef159d31c Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Wed, 6 Apr 2022 22:17:31 +0000 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I4b64df577f07366017de1b319de23d126a2d92f2 --- tools/recovery_l10n/res/values-te/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/recovery_l10n/res/values-te/strings.xml b/tools/recovery_l10n/res/values-te/strings.xml index ecea4329..38ca6127 100644 --- a/tools/recovery_l10n/res/values-te/strings.xml +++ b/tools/recovery_l10n/res/values-te/strings.xml @@ -4,7 +4,7 @@ "సిస్టమ్ అప్‌డేట్‌ను ఇన్‍స్టాల్ చేస్తోంది" "డేటాను తొలగిస్తోంది" "ఆదేశం లేదు" - "ఎర్రర్ సంభవించింది!" + "ఎర్రర్ ఏర్పడింది!" "సెక్యూరిటీ అప్‌డేట్‌ను ఇన్‌స్టాల్ చేస్తోంది" "Android సిస్టమ్‌ని లోడ్ చేయడం సాధ్యం కాదు. మీ డేటా పాడై ఉండవచ్చు. మీకు ఈ మెసేజ్‌ వస్తూనే ఉంటే, మీరు ఫ్యాక్టరీ డేటా రీసెట్ చేసి, పరికరంలో నిల్వ అయిన వినియోగదారు డేటా మొత్తాన్ని తొలగించాల్సి రావచ్చు." "మళ్లీ ప్రయత్నించు" -- cgit v1.2.3 From 7a46747dea091e6460016530c2471051aa91a862 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Sat, 30 Apr 2022 03:14:51 +0000 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I93318e624a68ac0f50ed90589cd051e3e6e18a0b --- tools/recovery_l10n/res/values-nb/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/recovery_l10n/res/values-nb/strings.xml b/tools/recovery_l10n/res/values-nb/strings.xml index e8cad136..61d1173c 100644 --- a/tools/recovery_l10n/res/values-nb/strings.xml +++ b/tools/recovery_l10n/res/values-nb/strings.xml @@ -7,7 +7,7 @@ "Feil!" "Installerer sikkerhetsoppdateringen" "Kan ikke laste inn Android-systemet. Dataene dine er muligens skadet. Hvis du fortsetter å se denne meldingen, må du muligens tilbakestille til fabrikkstandard og tømme alle brukerdataene som er lagret på denne enheten." - "Prøv igjen" + "Prøv på nytt" "Tilbakestill til fabrikkstandard" "Vil du viske ut alle brukerdataene?\n\n DETTE KAN IKKE ANGRES!" "Avbryt" -- cgit v1.2.3 From 710d2edf3d844d0276d102b07db4aecd6cf837a9 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Sat, 30 Apr 2022 03:15:53 +0000 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I3da0aa0734b66e6d585aeab783d3467af1717967 --- tools/recovery_l10n/res/values-nb/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/recovery_l10n/res/values-nb/strings.xml b/tools/recovery_l10n/res/values-nb/strings.xml index e8cad136..61d1173c 100644 --- a/tools/recovery_l10n/res/values-nb/strings.xml +++ b/tools/recovery_l10n/res/values-nb/strings.xml @@ -7,7 +7,7 @@ "Feil!" "Installerer sikkerhetsoppdateringen" "Kan ikke laste inn Android-systemet. Dataene dine er muligens skadet. Hvis du fortsetter å se denne meldingen, må du muligens tilbakestille til fabrikkstandard og tømme alle brukerdataene som er lagret på denne enheten." - "Prøv igjen" + "Prøv på nytt" "Tilbakestill til fabrikkstandard" "Vil du viske ut alle brukerdataene?\n\n DETTE KAN IKKE ANGRES!" "Avbryt" -- cgit v1.2.3 From 1eaa8fe72715fd97aeb5a77ee73bc78b9238fe9c Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Sun, 8 May 2022 05:01:47 +0000 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I7e5786bab25502369bf54ba66395feda68d98d58 --- tools/recovery_l10n/res/values-ky/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/recovery_l10n/res/values-ky/strings.xml b/tools/recovery_l10n/res/values-ky/strings.xml index 45fcd15e..67dca2a3 100644 --- a/tools/recovery_l10n/res/values-ky/strings.xml +++ b/tools/recovery_l10n/res/values-ky/strings.xml @@ -1,7 +1,7 @@ - "Тутум жаңырууда" + "Система жаңырууда" "Тазаланууда" "Буйрук берилген жок" "Ката!" -- cgit v1.2.3 From ebb89217769284e585c90ac73e11ebfae991684f Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Sun, 8 May 2022 05:02:54 +0000 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I86f5042642be8de9312015654a9017aa7ae2763f --- tools/recovery_l10n/res/values-ky/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/recovery_l10n/res/values-ky/strings.xml b/tools/recovery_l10n/res/values-ky/strings.xml index 45fcd15e..67dca2a3 100644 --- a/tools/recovery_l10n/res/values-ky/strings.xml +++ b/tools/recovery_l10n/res/values-ky/strings.xml @@ -1,7 +1,7 @@ - "Тутум жаңырууда" + "Система жаңырууда" "Тазаланууда" "Буйрук берилген жок" "Ката!" -- cgit v1.2.3 From 03281a2b5e525f894d2e984b209cf69e0f3a5050 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Sun, 15 May 2022 07:22:47 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: Ifdf310f5ae18adcdd3f0c656e2b5272f98cdc113 --- tools/recovery_l10n/res/values-te/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/recovery_l10n/res/values-te/strings.xml b/tools/recovery_l10n/res/values-te/strings.xml index 38ca6127..57470752 100644 --- a/tools/recovery_l10n/res/values-te/strings.xml +++ b/tools/recovery_l10n/res/values-te/strings.xml @@ -10,5 +10,5 @@ "మళ్లీ ప్రయత్నించు" "ఫ్యాక్టరీ డేటా రీసెట్" "వినియోగదారు డేటా మొత్తాన్ని తొలగించాలా?\n\n ఈ చర్యను రద్దు చేయలేరు!" - "రద్దు చేయి" + "రద్దు చేయండి" -- cgit v1.2.3 From 357ae4bdacf3abbca5c1d0b1afe6cd2af3026d91 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Sun, 15 May 2022 07:24:03 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I256eceb5431b39109cf150a71f65edc153646e3f --- tools/recovery_l10n/res/values-te/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/recovery_l10n/res/values-te/strings.xml b/tools/recovery_l10n/res/values-te/strings.xml index 38ca6127..57470752 100644 --- a/tools/recovery_l10n/res/values-te/strings.xml +++ b/tools/recovery_l10n/res/values-te/strings.xml @@ -10,5 +10,5 @@ "మళ్లీ ప్రయత్నించు" "ఫ్యాక్టరీ డేటా రీసెట్" "వినియోగదారు డేటా మొత్తాన్ని తొలగించాలా?\n\n ఈ చర్యను రద్దు చేయలేరు!" - "రద్దు చేయి" + "రద్దు చేయండి" -- cgit v1.2.3 From 053389aaba4f09069f30e59b3a12f88e246b5cb4 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Mon, 11 Jul 2022 11:39:44 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: Ie713bbc58d9f13b52d8c04b61bece714a19b5137 --- tools/recovery_l10n/res/values-or/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/recovery_l10n/res/values-or/strings.xml b/tools/recovery_l10n/res/values-or/strings.xml index 25b28e65..683bf191 100644 --- a/tools/recovery_l10n/res/values-or/strings.xml +++ b/tools/recovery_l10n/res/values-or/strings.xml @@ -10,5 +10,5 @@ "ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ" "ଫ୍ୟାକ୍ଟୋରୀ ଡାଟା ରିସେଟ୍‌" "ସମସ୍ଯ ଉପଯୋଗକର୍ତ୍ତା ଡାଟା ୱାଇପ୍‍ କରିବେ?\n\n ଏହା ଫେରାଇ ନିଆଯାଇପାରିବ ନାହିଁ!" - "ବାତିଲ୍‌ କରନ୍ତୁ" + "ବାତିଲ କରନ୍ତୁ" -- cgit v1.2.3 From 42decfe22290c80dbe46ba3ea29dcb073ca1be59 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Thu, 14 Jul 2022 00:55:14 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I8fe3e6fb457ed626aab7349c1c92aff058d913f8 --- tools/recovery_l10n/res/values-or/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/recovery_l10n/res/values-or/strings.xml b/tools/recovery_l10n/res/values-or/strings.xml index 25b28e65..683bf191 100644 --- a/tools/recovery_l10n/res/values-or/strings.xml +++ b/tools/recovery_l10n/res/values-or/strings.xml @@ -10,5 +10,5 @@ "ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ" "ଫ୍ୟାକ୍ଟୋରୀ ଡାଟା ରିସେଟ୍‌" "ସମସ୍ଯ ଉପଯୋଗକର୍ତ୍ତା ଡାଟା ୱାଇପ୍‍ କରିବେ?\n\n ଏହା ଫେରାଇ ନିଆଯାଇପାରିବ ନାହିଁ!" - "ବାତିଲ୍‌ କରନ୍ତୁ" + "ବାତିଲ କରନ୍ତୁ" -- cgit v1.2.3 From e5e115198e2920fc98fdb83388688575715710e7 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Thu, 14 Jul 2022 12:00:26 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: Ie5021da59605d3e5656f093373c92ba560a2592e --- tools/recovery_l10n/res/values-or/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/recovery_l10n/res/values-or/strings.xml b/tools/recovery_l10n/res/values-or/strings.xml index 25b28e65..683bf191 100644 --- a/tools/recovery_l10n/res/values-or/strings.xml +++ b/tools/recovery_l10n/res/values-or/strings.xml @@ -10,5 +10,5 @@ "ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ" "ଫ୍ୟାକ୍ଟୋରୀ ଡାଟା ରିସେଟ୍‌" "ସମସ୍ଯ ଉପଯୋଗକର୍ତ୍ତା ଡାଟା ୱାଇପ୍‍ କରିବେ?\n\n ଏହା ଫେରାଇ ନିଆଯାଇପାରିବ ନାହିଁ!" - "ବାତିଲ୍‌ କରନ୍ତୁ" + "ବାତିଲ କରନ୍ତୁ" -- cgit v1.2.3 From a155a75271e347a293744042a5c96aff200c3d75 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Thu, 14 Jul 2022 12:01:54 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: Id84ffea3ff2a2d494aa52570f3459696d779ab35 --- tools/recovery_l10n/res/values-or/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/recovery_l10n/res/values-or/strings.xml b/tools/recovery_l10n/res/values-or/strings.xml index 25b28e65..683bf191 100644 --- a/tools/recovery_l10n/res/values-or/strings.xml +++ b/tools/recovery_l10n/res/values-or/strings.xml @@ -10,5 +10,5 @@ "ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ" "ଫ୍ୟାକ୍ଟୋରୀ ଡାଟା ରିସେଟ୍‌" "ସମସ୍ଯ ଉପଯୋଗକର୍ତ୍ତା ଡାଟା ୱାଇପ୍‍ କରିବେ?\n\n ଏହା ଫେରାଇ ନିଆଯାଇପାରିବ ନାହିଁ!" - "ବାତିଲ୍‌ କରନ୍ତୁ" + "ବାତିଲ କରନ୍ତୁ" -- cgit v1.2.3 From da426cb315821c7a2be747cb277cd18f4a70c892 Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Thu, 4 Aug 2022 10:05:43 -0700 Subject: Fix misconfigured recovery host test Test: atest recovery_host_test Bug: 241353143 Change-Id: I13bb9595745f65a63070cf9fe030c9155f75e4d0 (cherry picked from commit 9ce95441b255cec017bf4080f61ddd0b41628f3f) Merged-In: I13bb9595745f65a63070cf9fe030c9155f75e4d0 --- tests/Android.bp | 1 + tests/AndroidTest.xml | 28 ---------------------------- tests/RecoveryHostTest.xml | 28 ++++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 28 deletions(-) delete mode 100644 tests/AndroidTest.xml create mode 100644 tests/RecoveryHostTest.xml diff --git a/tests/Android.bp b/tests/Android.bp index 9ad3d3b8..0708e855 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -216,6 +216,7 @@ cc_test_host { ], test_suites: ["general-tests"], + test_config: "RecoveryHostTest.xml", data: ["testdata/*"], diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml deleted file mode 100644 index 0ac75e4e..00000000 --- a/tests/AndroidTest.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - diff --git a/tests/RecoveryHostTest.xml b/tests/RecoveryHostTest.xml new file mode 100644 index 00000000..0ac75e4e --- /dev/null +++ b/tests/RecoveryHostTest.xml @@ -0,0 +1,28 @@ + + + + -- cgit v1.2.3 From 620bd456d5d14b5ae1fc67f650d9776bef9a2c1f Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Thu, 4 Aug 2022 10:05:43 -0700 Subject: Fix misconfigured recovery host test Test: atest recovery_host_test Bug: 241353143 Change-Id: I13bb9595745f65a63070cf9fe030c9155f75e4d0 (cherry picked from commit 9ce95441b255cec017bf4080f61ddd0b41628f3f) Merged-In: I13bb9595745f65a63070cf9fe030c9155f75e4d0 --- tests/Android.bp | 1 + tests/AndroidTest.xml | 28 ---------------------------- tests/RecoveryHostTest.xml | 28 ++++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 28 deletions(-) delete mode 100644 tests/AndroidTest.xml create mode 100644 tests/RecoveryHostTest.xml diff --git a/tests/Android.bp b/tests/Android.bp index 9ad3d3b8..0708e855 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -216,6 +216,7 @@ cc_test_host { ], test_suites: ["general-tests"], + test_config: "RecoveryHostTest.xml", data: ["testdata/*"], diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml deleted file mode 100644 index 0ac75e4e..00000000 --- a/tests/AndroidTest.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - diff --git a/tests/RecoveryHostTest.xml b/tests/RecoveryHostTest.xml new file mode 100644 index 00000000..0ac75e4e --- /dev/null +++ b/tests/RecoveryHostTest.xml @@ -0,0 +1,28 @@ + + + + -- cgit v1.2.3 From 39c684a71cb32087b86e24be88bd11570f7356c4 Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Thu, 4 Aug 2022 10:05:43 -0700 Subject: Fix misconfigured recovery host test Test: atest recovery_host_test Bug: 241353143 Change-Id: I13bb9595745f65a63070cf9fe030c9155f75e4d0 (cherry picked from commit 9ce95441b255cec017bf4080f61ddd0b41628f3f) Merged-In: I13bb9595745f65a63070cf9fe030c9155f75e4d0 --- tests/Android.bp | 1 + tests/AndroidTest.xml | 28 ---------------------------- tests/RecoveryHostTest.xml | 28 ++++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 28 deletions(-) delete mode 100644 tests/AndroidTest.xml create mode 100644 tests/RecoveryHostTest.xml diff --git a/tests/Android.bp b/tests/Android.bp index 9ad3d3b8..0708e855 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -216,6 +216,7 @@ cc_test_host { ], test_suites: ["general-tests"], + test_config: "RecoveryHostTest.xml", data: ["testdata/*"], diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml deleted file mode 100644 index 0ac75e4e..00000000 --- a/tests/AndroidTest.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - diff --git a/tests/RecoveryHostTest.xml b/tests/RecoveryHostTest.xml new file mode 100644 index 00000000..0ac75e4e --- /dev/null +++ b/tests/RecoveryHostTest.xml @@ -0,0 +1,28 @@ + + + + -- cgit v1.2.3 From 9aebac27226e45d21da6a26e14eebb5488a70403 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Wed, 24 Aug 2022 19:43:19 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I81ef61c2599cdd98f8cc1049c36a8deaf6283cd8 --- tools/recovery_l10n/res/values-ro/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/recovery_l10n/res/values-ro/strings.xml b/tools/recovery_l10n/res/values-ro/strings.xml index 585db835..e5dc5a96 100644 --- a/tools/recovery_l10n/res/values-ro/strings.xml +++ b/tools/recovery_l10n/res/values-ro/strings.xml @@ -10,5 +10,5 @@ "Reîncercați" "Revenire la setările din fabrică" "Ștergeți toate datele utilizatorului?\n\n ACEST LUCRU NU POATE FI ANULAT!" - "Anulați" + "Anulează" -- cgit v1.2.3 From cb5879f9decff4ca04c1c53a3e9b003d42a27efa Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Wed, 24 Aug 2022 19:44:34 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: Ice8bed9dcbef8c334c00f652772513936ff68911 --- tools/recovery_l10n/res/values-ro/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/recovery_l10n/res/values-ro/strings.xml b/tools/recovery_l10n/res/values-ro/strings.xml index 585db835..e5dc5a96 100644 --- a/tools/recovery_l10n/res/values-ro/strings.xml +++ b/tools/recovery_l10n/res/values-ro/strings.xml @@ -10,5 +10,5 @@ "Reîncercați" "Revenire la setările din fabrică" "Ștergeți toate datele utilizatorului?\n\n ACEST LUCRU NU POATE FI ANULAT!" - "Anulați" + "Anulează" -- cgit v1.2.3 From 1fa66bbb0a62d3d9f203d96e14e6b84b09726bca Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Wed, 24 Aug 2022 19:45:45 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I881456f8d9319947b42ead7376662b617680aa99 --- tools/recovery_l10n/res/values-ro/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/recovery_l10n/res/values-ro/strings.xml b/tools/recovery_l10n/res/values-ro/strings.xml index 585db835..e5dc5a96 100644 --- a/tools/recovery_l10n/res/values-ro/strings.xml +++ b/tools/recovery_l10n/res/values-ro/strings.xml @@ -10,5 +10,5 @@ "Reîncercați" "Revenire la setările din fabrică" "Ștergeți toate datele utilizatorului?\n\n ACEST LUCRU NU POATE FI ANULAT!" - "Anulați" + "Anulează" -- cgit v1.2.3 From e43c5033cb5b82d9e46ee398524a8972dc87b896 Mon Sep 17 00:00:00 2001 From: Weizhung Ding Date: Tue, 19 Jul 2022 16:34:43 +0800 Subject: minui: Add API to support multiple connectors detection Add API to support multiple connectors detection Bug: 227468133 Test: check log in recovery mode Change-Id: I18c5e0f373a29b153aab038bd289eed18847f2af Merged-In: I18c5e0f373a29b153aab038bd289eed18847f2af --- minui/graphics.cpp | 4 ++++ minui/graphics.h | 5 ++++- minui/graphics_drm.cpp | 4 ++++ minui/graphics_drm.h | 1 + minui/graphics_fbdev.cpp | 5 +++++ minui/graphics_fbdev.h | 1 + minui/include/minui/minui.h | 1 + 7 files changed, 20 insertions(+), 1 deletion(-) diff --git a/minui/graphics.cpp b/minui/graphics.cpp index b24c2b11..41a36611 100644 --- a/minui/graphics.cpp +++ b/minui/graphics.cpp @@ -502,3 +502,7 @@ void gr_fb_blank(bool blank, int index) { void gr_rotate(GRRotation rot) { rotation = rot; } + +bool gr_has_multiple_connectors() { + return gr_backend->HasMultipleConnectors(); +} diff --git a/minui/graphics.h b/minui/graphics.h index 5408c93e..ff063ae2 100644 --- a/minui/graphics.h +++ b/minui/graphics.h @@ -40,8 +40,11 @@ class MinuiBackend { // Blank (or unblank) the specific screen. virtual void Blank(bool blank, DrmConnector index) = 0; + // Return true if the device supports multiple connectors. + virtual bool HasMultipleConnectors() = 0; + // Device cleanup when drawing is done. - virtual ~MinuiBackend() {}; + virtual ~MinuiBackend() = default; }; #endif // _GRAPHICS_H_ diff --git a/minui/graphics_drm.cpp b/minui/graphics_drm.cpp index c5570227..6c3a5bde 100644 --- a/minui/graphics_drm.cpp +++ b/minui/graphics_drm.cpp @@ -200,6 +200,10 @@ void MinuiBackendDrm::Blank(bool blank, DrmConnector index) { } } +bool MinuiBackendDrm::HasMultipleConnectors() { + return (drm[DRM_SEC].GRSurfaceDrms[0] && drm[DRM_SEC].GRSurfaceDrms[1]); +} + static drmModeCrtc* find_crtc_for_connector(int fd, drmModeRes* resources, drmModeConnector* connector) { // Find the encoder. If we already have one, just use it. diff --git a/minui/graphics_drm.h b/minui/graphics_drm.h index fe3beaff..a8c9886e 100644 --- a/minui/graphics_drm.h +++ b/minui/graphics_drm.h @@ -60,6 +60,7 @@ class MinuiBackendDrm : public MinuiBackend { GRSurface* Flip() override; void Blank(bool) override; void Blank(bool blank, DrmConnector index) override; + bool HasMultipleConnectors() override; private: void DrmDisableCrtc(int drm_fd, drmModeCrtc* crtc); diff --git a/minui/graphics_fbdev.cpp b/minui/graphics_fbdev.cpp index 1cb0c0ab..4a7d3252 100644 --- a/minui/graphics_fbdev.cpp +++ b/minui/graphics_fbdev.cpp @@ -47,6 +47,11 @@ void MinuiBackendFbdev::Blank(bool blank, DrmConnector index) { fprintf(stderr, "Unsupported multiple connectors, blank = %d, index = %d\n", blank, index); } +bool MinuiBackendFbdev::HasMultipleConnectors() { + fprintf(stderr, "Unsupported multiple connectors\n"); + return false; +} + void MinuiBackendFbdev::SetDisplayedFramebuffer(size_t n) { if (n > 1 || !double_buffered) return; diff --git a/minui/graphics_fbdev.h b/minui/graphics_fbdev.h index 7e193c4f..c772428d 100644 --- a/minui/graphics_fbdev.h +++ b/minui/graphics_fbdev.h @@ -57,6 +57,7 @@ class MinuiBackendFbdev : public MinuiBackend { GRSurface* Flip() override; void Blank(bool) override; void Blank(bool blank, DrmConnector index) override; + bool HasMultipleConnectors() override; private: void SetDisplayedFramebuffer(size_t n); diff --git a/minui/include/minui/minui.h b/minui/include/minui/minui.h index f9be82f5..2353ed3b 100644 --- a/minui/include/minui/minui.h +++ b/minui/include/minui/minui.h @@ -129,6 +129,7 @@ int gr_fb_height(); void gr_flip(); void gr_fb_blank(bool blank); void gr_fb_blank(bool blank, int index); +bool gr_has_multiple_connectors(); // Clears entire surface to current color. void gr_clear(); -- cgit v1.2.3 From f2f5aa2e2ef8b7498e4d17d04f4cb4e79b64774a Mon Sep 17 00:00:00 2001 From: fredchiou Date: Fri, 11 Feb 2022 16:39:53 +0800 Subject: recovery_ui:Add support for multiple connectors switch Bug: 199253219 Test: display can switch in recovery Change-Id: If58ea5423f64420db3e5bd9307194b56129d6543 Merged-In: If58ea5423f64420db3e5bd9307194b56129d6543 --- recovery_ui/include/recovery_ui/screen_ui.h | 6 ++++ recovery_ui/include/recovery_ui/stub_ui.h | 4 +++ recovery_ui/include/recovery_ui/ui.h | 2 ++ recovery_ui/screen_ui.cpp | 54 ++++++++++++++++++++++++++++- recovery_ui/ui.cpp | 5 +++ 5 files changed, 70 insertions(+), 1 deletion(-) diff --git a/recovery_ui/include/recovery_ui/screen_ui.h b/recovery_ui/include/recovery_ui/screen_ui.h index 92b3c254..99ad5342 100644 --- a/recovery_ui/include/recovery_ui/screen_ui.h +++ b/recovery_ui/include/recovery_ui/screen_ui.h @@ -245,6 +245,9 @@ class ScreenRecoveryUI : public RecoveryUI, public DrawInterface { const std::vector& backup_headers, const std::vector& backup_items, const std::function& key_handler) override; + // For Lid switch handle + int SetSwCallback(int code, int value) override; + protected: static constexpr int kMenuIndent = 4; @@ -404,6 +407,9 @@ class ScreenRecoveryUI : public RecoveryUI, public DrawInterface { std::mutex updateMutex; + // Switch the display to active one after graphics is ready + bool is_graphics_available; + private: void SetLocale(const std::string&); diff --git a/recovery_ui/include/recovery_ui/stub_ui.h b/recovery_ui/include/recovery_ui/stub_ui.h index 511b1314..49689ba3 100644 --- a/recovery_ui/include/recovery_ui/stub_ui.h +++ b/recovery_ui/include/recovery_ui/stub_ui.h @@ -80,6 +80,10 @@ class StubRecoveryUI : public RecoveryUI { } void SetTitle(const std::vector& /* lines */) override {} + + int SetSwCallback(int /* code */, int /* value */) override { + return 0; + } }; #endif // RECOVERY_STUB_UI_H diff --git a/recovery_ui/include/recovery_ui/ui.h b/recovery_ui/include/recovery_ui/ui.h index 512732f9..c3e3ee26 100644 --- a/recovery_ui/include/recovery_ui/ui.h +++ b/recovery_ui/include/recovery_ui/ui.h @@ -231,6 +231,8 @@ class RecoveryUI { bool InitScreensaver(); void SetScreensaverState(ScreensaverState state); + virtual int SetSwCallback(int code, int value) = 0; + // Key event input queue std::mutex key_queue_mutex; std::condition_variable key_queue_cond; diff --git a/recovery_ui/screen_ui.cpp b/recovery_ui/screen_ui.cpp index b2c828f3..ee3cbb13 100644 --- a/recovery_ui/screen_ui.cpp +++ b/recovery_ui/screen_ui.cpp @@ -48,6 +48,11 @@ #include "recovery_ui/device.h" #include "recovery_ui/ui.h" +enum DirectRenderManager { + DRM_INNER, + DRM_OUTER, +}; + // Return the current time as a double (including fractions of a second). static double now() { struct timeval tv; @@ -334,7 +339,8 @@ ScreenRecoveryUI::ScreenRecoveryUI(bool scrollable_menu) stage(-1), max_stage(-1), locale_(""), - rtl_locale_(false) {} + rtl_locale_(false), + is_graphics_available(false) {} ScreenRecoveryUI::~ScreenRecoveryUI() { progress_thread_stopped_ = true; @@ -906,6 +912,7 @@ bool ScreenRecoveryUI::Init(const std::string& locale) { if (!InitGraphics()) { return false; } + is_graphics_available = true; if (!InitTextParams()) { return false; @@ -950,6 +957,9 @@ bool ScreenRecoveryUI::Init(const std::string& locale) { // Keep the progress bar updated, even when the process is otherwise busy. progress_thread_ = std::thread(&ScreenRecoveryUI::ProgressThreadLoop, this); + // set the callback for hall sensor event + (void)ev_sync_sw_state([this](auto&& a, auto&& b) { return this->SetSwCallback(a, b);}); + return true; } @@ -1367,3 +1377,45 @@ void ScreenRecoveryUI::SetLocale(const std::string& new_locale) { } } } + +int ScreenRecoveryUI::SetSwCallback(int code, int value) { + if (!is_graphics_available) { return -1; } + if (code > SW_MAX) { return -1; } + if (code != SW_LID) { return 0; } + + /* detect dual display */ + if (!gr_has_multiple_connectors()) { return -1; } + + /* turn off all screen */ + gr_fb_blank(true, DirectRenderManager::DRM_INNER); + gr_fb_blank(true, DirectRenderManager::DRM_OUTER); + gr_color(0, 0, 0, 255); + gr_clear(); + + /* turn on the screen */ + gr_fb_blank(false, value); + gr_flip(); + + /* set the retation */ + std::string rotation_str; + if (value == DirectRenderManager::DRM_OUTER) { + rotation_str = + android::base::GetProperty("ro.minui.second_rotation", "ROTATION_NONE"); + } else { + rotation_str = + android::base::GetProperty("ro.minui.default_rotation", "ROTATION_NONE"); + } + + if (rotation_str == "ROTATION_RIGHT") { + gr_rotate(GRRotation::RIGHT); + } else if (rotation_str == "ROTATION_DOWN") { + gr_rotate(GRRotation::DOWN); + } else if (rotation_str == "ROTATION_LEFT") { + gr_rotate(GRRotation::LEFT); + } else { // "ROTATION_NONE" or unknown string + gr_rotate(GRRotation::NONE); + } + Redraw(); + + return 0; +} diff --git a/recovery_ui/ui.cpp b/recovery_ui/ui.cpp index 6e67b1d4..eb87f526 100644 --- a/recovery_ui/ui.cpp +++ b/recovery_ui/ui.cpp @@ -341,6 +341,11 @@ int RecoveryUI::OnInputEvent(int fd, uint32_t epevents) { ProcessKey(ev.code, ev.value); } + // For Lid switch handle + if (ev.type == EV_SW) { + SetSwCallback(ev.code, ev.value); + } + return 0; } -- cgit v1.2.3 From 20a7be78505377733a1a225f6d510d9a7e9def7c Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Wed, 31 Aug 2022 16:03:28 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I62a78828eb7d1879cdd6cede92e705ed9f7da8b3 --- tools/recovery_l10n/res/values-ro/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/recovery_l10n/res/values-ro/strings.xml b/tools/recovery_l10n/res/values-ro/strings.xml index e5dc5a96..2f1cccdb 100644 --- a/tools/recovery_l10n/res/values-ro/strings.xml +++ b/tools/recovery_l10n/res/values-ro/strings.xml @@ -6,9 +6,9 @@ "Nicio comandă" "Eroare!" "Se instalează actualizarea de securitate" - "Nu se poate încărca sistemul Android. Datele dvs. pot fi corupte. Dacă primiți în continuare acest mesaj, poate fi necesar să reveniți la setările din fabrică și să ștergeți toate datele utilizatorului stocate pe acest dispozitiv." + "Nu se poate încărca sistemul Android. Datele tale pot fi corupte. Dacă primești în continuare acest mesaj, poate fi necesar să revii la setările din fabrică și să ștergi toate datele utilizatorului stocate pe acest dispozitiv." "Reîncercați" "Revenire la setările din fabrică" - "Ștergeți toate datele utilizatorului?\n\n ACEST LUCRU NU POATE FI ANULAT!" + "Șterge toate datele utilizatorului?\n\n ACEST LUCRU NU POATE FI ANULAT!" "Anulează" -- cgit v1.2.3 From 3705aa8cd49f7918f17809a062a77de95228b87a Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Sat, 3 Sep 2022 18:49:23 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I12e38d495e4959b49de440856a2b355a3fa3cd0d --- tools/recovery_l10n/res/values-ro/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/recovery_l10n/res/values-ro/strings.xml b/tools/recovery_l10n/res/values-ro/strings.xml index e5dc5a96..2f1cccdb 100644 --- a/tools/recovery_l10n/res/values-ro/strings.xml +++ b/tools/recovery_l10n/res/values-ro/strings.xml @@ -6,9 +6,9 @@ "Nicio comandă" "Eroare!" "Se instalează actualizarea de securitate" - "Nu se poate încărca sistemul Android. Datele dvs. pot fi corupte. Dacă primiți în continuare acest mesaj, poate fi necesar să reveniți la setările din fabrică și să ștergeți toate datele utilizatorului stocate pe acest dispozitiv." + "Nu se poate încărca sistemul Android. Datele tale pot fi corupte. Dacă primești în continuare acest mesaj, poate fi necesar să revii la setările din fabrică și să ștergi toate datele utilizatorului stocate pe acest dispozitiv." "Reîncercați" "Revenire la setările din fabrică" - "Ștergeți toate datele utilizatorului?\n\n ACEST LUCRU NU POATE FI ANULAT!" + "Șterge toate datele utilizatorului?\n\n ACEST LUCRU NU POATE FI ANULAT!" "Anulează" -- cgit v1.2.3 From 6b2b229fbe3b1121983a7ac4cfa0029ebbb8360c Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Sat, 3 Sep 2022 18:51:47 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: If53be51c5be2ce7422349844a45a24ba39efa495 --- tools/recovery_l10n/res/values-ro/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/recovery_l10n/res/values-ro/strings.xml b/tools/recovery_l10n/res/values-ro/strings.xml index e5dc5a96..2f1cccdb 100644 --- a/tools/recovery_l10n/res/values-ro/strings.xml +++ b/tools/recovery_l10n/res/values-ro/strings.xml @@ -6,9 +6,9 @@ "Nicio comandă" "Eroare!" "Se instalează actualizarea de securitate" - "Nu se poate încărca sistemul Android. Datele dvs. pot fi corupte. Dacă primiți în continuare acest mesaj, poate fi necesar să reveniți la setările din fabrică și să ștergeți toate datele utilizatorului stocate pe acest dispozitiv." + "Nu se poate încărca sistemul Android. Datele tale pot fi corupte. Dacă primești în continuare acest mesaj, poate fi necesar să revii la setările din fabrică și să ștergi toate datele utilizatorului stocate pe acest dispozitiv." "Reîncercați" "Revenire la setările din fabrică" - "Ștergeți toate datele utilizatorului?\n\n ACEST LUCRU NU POATE FI ANULAT!" + "Șterge toate datele utilizatorului?\n\n ACEST LUCRU NU POATE FI ANULAT!" "Anulează" -- cgit v1.2.3 From d3cd440d2d41cfb973238401b6f2b7fcbf9d135c Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Thu, 4 Aug 2022 10:05:43 -0700 Subject: Fix misconfigured recovery host test Test: atest recovery_host_test Bug: 241353143 Change-Id: I13bb9595745f65a63070cf9fe030c9155f75e4d0 (cherry picked from commit 9ce95441b255cec017bf4080f61ddd0b41628f3f) Merged-In: I13bb9595745f65a63070cf9fe030c9155f75e4d0 --- tests/Android.bp | 1 + tests/AndroidTest.xml | 28 ---------------------------- tests/RecoveryHostTest.xml | 28 ++++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 28 deletions(-) delete mode 100644 tests/AndroidTest.xml create mode 100644 tests/RecoveryHostTest.xml diff --git a/tests/Android.bp b/tests/Android.bp index 5ef4d58c..9395cbba 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -201,6 +201,7 @@ cc_test_host { ], test_suites: ["general-tests"], + test_config: "RecoveryHostTest.xml", data: ["testdata/*"], diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml deleted file mode 100644 index 0ac75e4e..00000000 --- a/tests/AndroidTest.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - diff --git a/tests/RecoveryHostTest.xml b/tests/RecoveryHostTest.xml new file mode 100644 index 00000000..0ac75e4e --- /dev/null +++ b/tests/RecoveryHostTest.xml @@ -0,0 +1,28 @@ + + + + -- cgit v1.2.3 From d1e5cf0eaefa3093415ebffe3edfb2a0b85bd3b6 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Sat, 15 Oct 2022 15:15:41 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I49504e35c1adce5761e22c46c858fca0eada73cf --- tools/recovery_l10n/res/values-eu/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/recovery_l10n/res/values-eu/strings.xml b/tools/recovery_l10n/res/values-eu/strings.xml index 005a0426..963101fa 100644 --- a/tools/recovery_l10n/res/values-eu/strings.xml +++ b/tools/recovery_l10n/res/values-eu/strings.xml @@ -9,6 +9,6 @@ "Ezin da kargatu Android sistema. Zure datuak hondatuta egon daitezke. Mezu hau jasotzen jarraitzen baduzu, jatorrizko datuak berrezarri beharko dituzu eta gailuan gordetako erabiltzaile-datu guztiak ezabatu beharko dituzu." "Saiatu berriro" "Berrezarri jatorrizko datuak" - "Erabiltzailearen datu guztiak xahutu nahi dituzu?\n\n EKINTZA HORI EZIN DA DESEGIN!" + "Erabiltzaile-datu guztiak xahutu nahi dituzu?\n\n EKINTZA HORI EZIN DA DESEGIN!" "Utzi" -- cgit v1.2.3 From 80267eba5d9ef2f991cfe96c726969a9499e3649 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Wed, 16 Nov 2022 04:29:52 -0800 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I242fd8d1a2309f4b64c88df8d4eac840ccb0eca2 --- tools/recovery_l10n/res/values-en-rCA/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/recovery_l10n/res/values-en-rCA/strings.xml b/tools/recovery_l10n/res/values-en-rCA/strings.xml index 6451e5b6..69be4bb0 100644 --- a/tools/recovery_l10n/res/values-en-rCA/strings.xml +++ b/tools/recovery_l10n/res/values-en-rCA/strings.xml @@ -9,6 +9,6 @@ "Cannot load Android system. Your data may be corrupt. If you continue to get this message, you may need to perform a factory data reset and erase all user data stored on this device." "Try again" "Factory data reset" - "Wipe all user data?\n\n THIS CANNOT BE UNDONE!" + "Wipe all user data?\n\n THIS CAN NOT BE UNDONE!" "Cancel" -- cgit v1.2.3 From b904bdb4458f2d274f128cfa81de21a07329133e Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Mon, 19 Dec 2022 01:04:29 -0800 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I966dc384c93bb8ff1fc53620f8f69fce32f81000 --- tools/recovery_l10n/res/values-b+sr+Latn/strings.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/recovery_l10n/res/values-b+sr+Latn/strings.xml b/tools/recovery_l10n/res/values-b+sr+Latn/strings.xml index 19c6f419..1583beaa 100644 --- a/tools/recovery_l10n/res/values-b+sr+Latn/strings.xml +++ b/tools/recovery_l10n/res/values-b+sr+Latn/strings.xml @@ -1,14 +1,14 @@ - "Ažuriranje sistema se instalira" - "Briše se" - "Nema komande" - "Greška!" - "Instalira se bezbednosno ažuriranje" - "Učitavanje Android sistema nije uspelo. Podaci su možda oštećeni. Ako nastavite da dobijate ovu poruku, možda ćete morati da resetujete uređaj na fabrička podešavanja i obrišete sve podatke korisnika koje čuvate na njemu." - "Probaj ponovo" - "Resetovanje na fabrička podešavanja" - "Želite li da izbrišete sve podatke korisnika?\n\n OVO NE MOŽE DA SE OPOZOVE!" - "Otkaži" + "Ажурирање система се инсталира" + "Брише се" + "Нема команде" + "Грешка!" + "Инсталира се безбедносно ажурирање" + "Учитавање Android система није успело. Подаци су можда оштећени. Ако наставите да добијате ову поруку, можда ћете морати да ресетујете уређај на фабричка подешавања и обришете све податке корисника које чувате на њему." + "Пробај поново" + "Ресетовање на фабричка подешавања" + "Желите ли да избришете све податке корисника?\n\n ОВО НЕ МОЖЕ ДА СЕ ОПОЗОВЕ!" + "Откажи" -- cgit v1.2.3 From 1788ccc385fbc51b7894faec980b748ffe5f0d12 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Thu, 29 Dec 2022 20:40:13 -0800 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I9ca1643c37cf1ccdfecff4bfd0f405718be75669 --- tools/recovery_l10n/res/values-b+sr+Latn/strings.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/recovery_l10n/res/values-b+sr+Latn/strings.xml b/tools/recovery_l10n/res/values-b+sr+Latn/strings.xml index 1583beaa..19c6f419 100644 --- a/tools/recovery_l10n/res/values-b+sr+Latn/strings.xml +++ b/tools/recovery_l10n/res/values-b+sr+Latn/strings.xml @@ -1,14 +1,14 @@ - "Ажурирање система се инсталира" - "Брише се" - "Нема команде" - "Грешка!" - "Инсталира се безбедносно ажурирање" - "Учитавање Android система није успело. Подаци су можда оштећени. Ако наставите да добијате ову поруку, можда ћете морати да ресетујете уређај на фабричка подешавања и обришете све податке корисника које чувате на њему." - "Пробај поново" - "Ресетовање на фабричка подешавања" - "Желите ли да избришете све податке корисника?\n\n ОВО НЕ МОЖЕ ДА СЕ ОПОЗОВЕ!" - "Откажи" + "Ažuriranje sistema se instalira" + "Briše se" + "Nema komande" + "Greška!" + "Instalira se bezbednosno ažuriranje" + "Učitavanje Android sistema nije uspelo. Podaci su možda oštećeni. Ako nastavite da dobijate ovu poruku, možda ćete morati da resetujete uređaj na fabrička podešavanja i obrišete sve podatke korisnika koje čuvate na njemu." + "Probaj ponovo" + "Resetovanje na fabrička podešavanja" + "Želite li da izbrišete sve podatke korisnika?\n\n OVO NE MOŽE DA SE OPOZOVE!" + "Otkaži" -- cgit v1.2.3