From 8331602e949ad95758f126fcac82b64c1249a3c2 Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Wed, 10 Aug 2016 12:33:05 +0100 Subject: [PATCH] If the device has FRP, prompt the user to set up a lockscreen FRP is kind of pointless if the device is freely accessible. Suggest setting up a secure lockscreen during setup. Ref CYNGNOS-3252 Change-Id: Ia807142ab08f388d533b5ee45d1fcbe81071f6d1 --- res/layout/setup_lockscreen.xml | 64 ++++++++++ res/values-af/strings.xml | 5 + res/values-ar/strings.xml | 5 + res/values-bg/strings.xml | 5 + res/values-ca/strings.xml | 5 + res/values-cs/strings.xml | 5 + res/values-da/strings.xml | 5 + res/values-de/strings.xml | 5 + res/values-el/strings.xml | 5 + res/values-es-rUS/strings.xml | 5 + res/values-es/strings.xml | 5 + res/values-eu-rES/strings.xml | 5 + res/values-fi/strings.xml | 5 + res/values-fr/strings.xml | 5 + res/values-gu-rIN/strings.xml | 5 + res/values-hr/strings.xml | 5 + res/values-hu/strings.xml | 5 + res/values-in/strings.xml | 5 + res/values-it/strings.xml | 5 + res/values-iw/strings.xml | 5 + res/values-ja/strings.xml | 5 + res/values-kn-rIN/strings.xml | 5 + res/values-ko/strings.xml | 5 + res/values-ml-rIN/strings.xml | 5 + res/values-mr-rIN/strings.xml | 5 + res/values-nb/strings.xml | 5 + res/values-nl/strings.xml | 5 + res/values-pl/strings.xml | 5 + res/values-pt-rBR/strings.xml | 5 + res/values-pt-rPT/strings.xml | 5 + res/values-ro/strings.xml | 5 + res/values-ru/strings.xml | 5 + res/values-sl/strings.xml | 5 + res/values-sr/strings.xml | 5 + res/values-sv/strings.xml | 5 + res/values-ta-rIN/strings.xml | 5 + res/values-te-rIN/strings.xml | 5 + res/values-th/strings.xml | 5 + res/values-tr/strings.xml | 5 + res/values-vi/strings.xml | 5 + res/values-zh-rCN/strings.xml | 5 + res/values-zh-rTW/strings.xml | 5 + res/values/strings.xml | 8 ++ .../setupwizard/SetupWizardApp.java | 2 + .../setupwizard/cmstats/SetupStats.java | 1 + .../setupwizard/setup/CMSetupWizardData.java | 2 + .../setup/ScreenLockSetupPage.java | 116 ++++++++++++++++++ 47 files changed, 398 insertions(+) create mode 100644 res/layout/setup_lockscreen.xml create mode 100644 src/com/cyanogenmod/setupwizard/setup/ScreenLockSetupPage.java diff --git a/res/layout/setup_lockscreen.xml b/res/layout/setup_lockscreen.xml new file mode 100644 index 0000000..20f06bd --- /dev/null +++ b/res/layout/setup_lockscreen.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 83fee1d..464040a 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -78,5 +78,10 @@ Voeg jou vingerafdruk by Stel skerm sluit op %1$s SIM opgespoor + + + Beskerm jou foon + Beskerm die toestel" en vereis 'n PIN, patroon of wagwoord om skerm te ontsluit" + Stel PIN, patroon of wagwoord op diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 49182a7..13c63ab 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -78,5 +78,10 @@ أضف بصمتك إنشاء إقفال الشاشة تم اكتشاف %1$s SIM + + + حماية هاتفك + حماية هذا الجهاز وطلب رقم تعريف شخصي أو نمط أو كلمة مرور لإلغاء قفل الشاشة. + إعداد رقم تعريف شخصي أو نمط أو كلمة مرور diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 1404f59..a27f294 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -79,6 +79,11 @@ Добавете вашият пръстов отпечатък Настройка на екрана за заключване Намерена %1$s СИМ карта + + + Защитете телефона си + Защитете у-вото и изисквайте ПИН код, фигура или парола за отключване на екрана + Настройване на ПИН код, фигура или парола Вашето устройство е готово за модификация Модулите ще направят в телефона по-бърз, по-умен и лесен за употреба. В това ръководство можете да откриете нови модове, да научите какво те правят и как да ги активирате и деактивирате. diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 4534c85..826c83a 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -79,6 +79,11 @@ Afegeix la teva empremta digital Configuració del bloqueig de pantalla %1$s SIM detectada + + + Protegeix el teu telèfon + Protegeix el dispositiu i estableix un PIN, un patró o una contrasenya per desbloquejar la pantalla + Configura el PIN, el patró o la contrasenya El teu dispositiu està llest pel MOD Els Mods fan el teu telèfon més ràpid, i més fàcil d\'utilitzar. En aquesta guia, pots descobrir nous mods, aprendre què fan, i habilitar-los o deshabilitar-los. diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 08bbe9c..c56e935 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -79,6 +79,11 @@ Přidat otisk prstu Nastavit zámek obrazovky Zjištěna %1$s SIM + + + Chraňte svůj telefon + Chránit toto zařízení a před odemknutím obrazovky požadovat kód PIN, gesto nebo heslo + Nastavit kód PIN, gesto nebo heslo Zařízení je připraveno k použití modů Mody zrychlují, zefektivňují a usnadňují používání telefonu. V této příručce můžete objevit nové mody, naučit se co dělají, povolit je nebo zakázat. diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index c61f342..91d09fe 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -78,5 +78,10 @@ Tilføje dit fingeraftryk Konfigurere skærmlås %1$s SIM-kort fundet + + + Beskyt din telefon + Beskyt denne enhed, og kræv pinkode, mønster eller adgangskode for at låse skærmen op + Konfigurer pinkode, mønster eller adgangskode diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 1b7bf3b..0e8339c 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -79,6 +79,11 @@ Fügen Sie Ihren Fingerabdruck hinzu. Die Bildschirmsperre einrichten %1$s SIM-Karte erkannt + + + Schützen Sie Ihr Telefon + Gerät schützen und PIN, Muster oder Passwort zur Display-Entsperrung verwenden + PIN, Muster oder Passwort einrichten Ihr Gerät ist MOD bereit Mods machen Ihr Mobiltelefon schneller, smarter und einfacher zu bedienen. In diesem Handbuch können Sie neue Mods entdecken, erfahren was sie tun und diese aktivieren oder deaktivieren. diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 5e6b480..3bccd5f 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -78,5 +78,10 @@ Προσθέστε το δακτυλικό σας αποτύπωμα Ρύθμιση κλειδώματος οθόνης Ανιχνεύθηκε %1$s SIM + + + Προστατέψτε το τηλέφωνό σας + Προστατέψτε αυτήν τη συσκευή και ζητήστε ένα PIN, ένα μοτίβο ή έναν κωδικό πρόσβασης για να ξεκλειδώσετε την οθόνη + Ρύθμιση PIN, μοτίβου ή κωδικού πρόσβασης diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 313f586..787469f 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -78,5 +78,10 @@ Añadir tu huella digital Configurar la pantalla bloqueada %1$s SIM detectada + + + Protege el teléfono + Proteger dispositivo y solicitar PIN/patrón/contraseña para desbloquear pantalla + Configurar PIN, patrón o contraseña diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index b313ed2..e65dbba 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -78,5 +78,10 @@ Añade tu huella digital Ajustes de pantalla de bloqueo %1$s SIM detectada + + + Protege tu teléfono + Proteger este dispositivo y establecer un PIN, un patrón o una contraseña para desbloquear la pantalla + Configurar PIN, patrón o contraseña diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml index e54aa9b..bd8f77d 100644 --- a/res/values-eu-rES/strings.xml +++ b/res/values-eu-rES/strings.xml @@ -79,6 +79,11 @@ Gehitu zure hatz-marka Ezarri pantaila blokeoa %1$s SIM antzeman da + + + Babestu telefonoa + Babestu gailua eta eskatu PIN kode, eredu edo pasahitz bat pantaila desblokeatzeko + Konfiguratu PIN kodea, eredua edo pasahitza Zure gailuak MODak onartzen ditu Modak zure telefona azkarragoa, adimentsuagoa eta erabilerrazagoa egiten dute. Gida honetan, mod berriak ezagutuko dituzu, zer egiten duten ulertu, eta nola gaitu eta desgaitu ikasiko duzu. diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index ac14ffe..e53e610 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -78,5 +78,10 @@ Lisää sormenjälkesi Aseta näytön lukitus %1$s SIM tunnistettu + + + Suojaa puhelintasi + Suojaa laitetta avaamalla näytön lukitus PIN-koodin, kuvion tai salasanan avulla + Aseta PIN-koodi, kuvio tai salasana diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 1292f3d..bbe411c 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -78,5 +78,10 @@ Ajouter votre empreinte digitale Configurer le verrouillage de l\'écran %1$s carte SIM détectée + + + Protéger votre téléphone + "Protéger l'appareil"" et exiger code, schéma ou mot de passe pour déverrouiller l'écran" + Configurer un code, un schéma ou un mot de passe diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml index 1fc52cc..6dc6a66 100644 --- a/res/values-gu-rIN/strings.xml +++ b/res/values-gu-rIN/strings.xml @@ -77,5 +77,10 @@ તમારી ફિંગરપ્રિન્ટ ઉમેરો સ્ક્રીન લૉક સેટઅપ કરો %1$s SIM સૂચિત + + + તમારા ફોનને સુરક્ષિત કરો + આ ઉપકરણને સુરક્ષિત કરો અને સ્ક્રીનને અનલૉક કરવા માટે PIN, પેટર્ન અથવા પાસવર્ડ જરૂરી + PIN, પેટર્ન અથવા પાસવર્ડ સેટ કરો diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index dc6289c..57ea6d4 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -79,6 +79,11 @@ Dodajte svoj ​​otisak Postavljanje zaključavanja zaslona %1$s SIM otkriven + + + Zaštitite svoj telefon + Zaštiti uređaj i zahtijevaj PIN, uzorak ili zaporku za otključavanje zaslona + Postavi PIN, uzorak ili zaporku Vaš uređaj je MOD Spreman Modovi čine telefon bržim, pametnijim i lakšim za korištenje. U ovom vodiču, možete otkriti nove modove, saznati što oni sve mogu, te ih omogućiti ili onemogućiti. diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 2a5c1a2..6940b86 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -77,5 +77,10 @@ Adja hozzá ujjlenyomatát Képernyőzár beállítása %1$s SIM észlelve + + + Óvja meg telefonját + Óvja meg eszközét, és a képernyőzár feloldásához állítson be PIN kódot, mintát vagy jelszót. + PIN kód, minta vagy jelszó beállítása diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 057fadc..4e5f972 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -78,5 +78,10 @@ Tambahkan sidik jari Anda Siapkan kunci layar %1$s SIM terdeteksi + + + Lindungi ponsel + Lindungi perangkat ini dan minta PIN, pola, atau sandi untuk membuka kunci layar + Siapkan PIN, pola, atau sandi diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 14f9825..f5d1609 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -79,6 +79,11 @@ Aggiungere un\'impronta Imposta una schermata di blocco %1$s SIM rilevata + + + Proteggi il tuo telefono + Proteggi il dispositivo e richiedi PIN, sequenza o password per sbloccare schermo + Configura PIN, sequenza o password Il tuo dispositivo è Mod Ready Le Mod rendono il dispositivo più veloce, intelligente e facile da usare. In questa guida puoi esplorare nuove Mod, conoscerne il funzionamento, attivarle o disattivarle. diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index ef5fb3d..a529063 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -79,5 +79,10 @@ הוסף את טביעת האצבע שלך הגדרת מסך נעילה זוהו %1$s כרטיסי SIM + + + הגן על הטלפון שלך + הגן על מכשיר זה ודרוש קוד אימות, קו או סיסמה לביטול נעילת המסך. + ‏הגדר PIN, קו ביטול נעילה או סיסמה diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index e074f29..947ea94 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -79,5 +79,10 @@ 指紋を追加 画面のロックをセットアップ %1$sのSIMを検出しました + + + スマートフォンの保護 + この端末を保護し、画面のロック解除にPIN、パターン、またはパスワードを必要とする + PIN、パターン、またはパスワードの設定 diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml index 06a2891..cc409f5 100644 --- a/res/values-kn-rIN/strings.xml +++ b/res/values-kn-rIN/strings.xml @@ -77,5 +77,10 @@ ನಿಮ್ಮ ಫಿಂಗರ್‍ಪ್ರಿಂಟನ್ನು ಸೇರಿಸಿ ಪರದೆ ಲಾಕ್ ಸೆಟಪ್ ಮಾಡಿ %1$s SIM ಗುರುತಿಸಲ್ಪಟ್ಟಿದೆ + + + ನಿಮ್ಮ ಫೋನನ್ನು ರಕ್ಷಿಸಿ + ಸಾಧನ ರಕ್ಷಿಸಿ. ಸ್ಕ್ರೀನ್‌ ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಪಿನ್, ಪ್ಯಾಟರ್ನ್, ಪಾಸ್‌ವರ್ಡ್ ಬೇಕಾಗುತ್ತದೆ + ಪಿನ್, ನಮೂನೆ ಅಥವಾ ಪಾಸ್‌ವರ್ಡ್‌ ಹೊಂದಿಸಿ diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 5756765..4560517 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -79,5 +79,10 @@ 지문 추가 화면 잠금 설정 %1$s SIM 인식됨 + + + 휴대전화 보호 + 이 기기를 보호하고 화면 잠금 해제용 PIN, 패턴 또는 비밀번호 요청 + PIN, 패턴 또는 비밀번호 설정하기 diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml index e5d3527..1c62a9e 100644 --- a/res/values-ml-rIN/strings.xml +++ b/res/values-ml-rIN/strings.xml @@ -77,5 +77,10 @@ നിങ്ങളുടെ വിരലടയാളം ചേർക്കുക സ്ക്രീൻ ലോക്ക് സജ്ജമാക്കുക %1$s SIM കണ്ടെത്തി + + + നിങ്ങളുടെ ഫോൺ പരിരക്ഷിക്കുക + ഈ ഉപകരണം പരിരക്ഷിക്കുക, സ്‌ക്രീൻ അൺലോക്കുചെയ്യാൻ പിൻ,പാറ്റേൺ അല്ലെങ്കിൽ പാസ്‌വേഡ് ആവശ്യമാണ് + പിൻ, പാറ്റേൺ അല്ലെങ്കിൽ പാസ്‌വേഡ് സജ്ജമാക്കുക diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml index b580365..5ae6719 100644 --- a/res/values-mr-rIN/strings.xml +++ b/res/values-mr-rIN/strings.xml @@ -77,5 +77,10 @@ तुमचा बोटाचा ठसा जोडा स्क्रीन लॉक सेटअप करा %1$s सिम आढळले + + + आपला फोन संरक्षित करा + हे डिव्हाइस संरक्षित करा आणि स्क्रीन अनलॉक करण्यासाठी पिन, नमुना किंवा संकेतशब्द आवश्यक आहे + पिन, नमुना किंवा संकेतशब्द सेट करा diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 5367a97..600c990 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -79,6 +79,11 @@ Legge til fingeravtrykket ditt Konfigurere skjermlås %1$s SIM oppdaget + + + Beskytt telefonen + Beskytt denne enheten og krev PIN-kode, mønster eller passord for å låse opp skjermen + Konfigurer PIN-kode, mønster eller passord Enheten din er MOD Klargjort Mods gjør telefonen din raskere, smartere og enklere å bruke. I denne veiledningen, kan du oppdage nye mods, lære om hva de gjør, og aktivere eller deaktivere dem. diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 8289efd..7dd698e 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -77,5 +77,10 @@ Uw vingerafdruk toe te voegen Schermvergrendeling in te stellen %1$s simkaart gedetecteerd + + + Bescherm je telefoon + Bescherm dit apparaat en vraag om een pincode, patroon of wachtwoord om het scherm te ontgrendelen + Pincode, patroon of wachtwoord instellen diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index f6c0ab8..174eec4 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -78,5 +78,10 @@ Dodać swój odcisk palca Skonfigurować blokadę ekranu Wykryto %1$s SIM + + + Zabezpiecz telefon + Zabezpiecz to urządzenie, wymagając kodu PIN, wzoru lub hasła do odblokowania ekranu + Ustaw PIN, wzorzec lub hasło diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index 7f3205c..a27023c 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -79,6 +79,11 @@ Adicionar sua impressão digital Configuração de bloqueio de tela Cartão SIM %1$s detectado + + + Proteger seu smartphone + Proteger este dispositivo e pedir PIN, padrão ou senha para desbloquear a tela + Configurar PIN, padrão ou senha Seu dispositivo esta pronto para MOD Mods deixa o seu telefone mais rápido, mais inteligente e mais fácil de usar. Neste guia, você pode descobrir novos mods, aprende o que eles fazem e os ativa ou desativa. diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index b0428ff..171b80d 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -79,6 +79,11 @@ Adicionar a sua impressão digital Configuração do ecrã de bloqueio Cartão SIM %1$s detetado + + + Proteger o seu telemóvel + Proteja este disp. e exija um PIN, seq. ou palavra-passe para desbloq. o ecrã + Configurar PIN, sequência ou palavra-passe O seu dispositivo está pronto para os MODS Os Mods tornam o seu telefone mais rápido, mais inteligente e mais fácil de usar. Neste guia pode descobrir novos mods, aprender o que eles fazem e ativá-los ou desativá-los. diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 39038d9..6a2ec9f 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -72,5 +72,10 @@ Adăugați-vă amprenta Setați blocarea de ecran SIM %1$s detectat + + + Protejați telefonul + Protejați dispozitivul cu PIN, model sau parolă necesară pt. a debloca ecranul + Configurați codul PIN, modelul sau parola diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 2bda72c..0207be4 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -78,5 +78,10 @@ Добавить ваши отпечатки Настроить экран блокировки Обнаружена %1$s SIM-карта + + + Защитите телефон + Защитить устройство и запрашивать PIN-код, графический ключ или пароль + Добавить PIN-код, графический ключ или пароль diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index d592f57..8029e43 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -79,6 +79,11 @@ Dodati svoj prstni odtis Nastaviti zaklepanje zaslona %1$s kartica SIM zaznana + + + Zaščitite telefon + Zaščiti napravo in za odklenitev zaslona zahtevaj kodo PIN, vzorec ali geslo + Nastavi kodo PIN, vzorec ali geslo Vaša naprava je pripravljena za modifikacije Modifikacije naredijo vaš telefon hitrejši, pametnejši in enostavnejši za uporabo. V tem vodniku lahko odkrijete nove modifikacije, se naučite, kaj naredijo, in jih omogočite ali onemogočite. diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 6a7fc7a..07b03e5 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -78,5 +78,10 @@ Додај свој отисак Подешавање закључавања екрана Откривен %1$s SIM + + + Заштитите телефон + Заштитите уређај и поставите PIN, шаблон или лозинку за откључавање екрана + Подеси PIN, шаблон или лозинку diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 9c5f30c..618ab36 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -77,5 +77,10 @@ Lägga till ditt fingeravtryck Konfigurera skärmlås %1$s SIM upptäckt + + + Skydda mobilen + Skydda den här enheten och kräv pinkod, mönster eller lösenord för att låsa upp skärmen + Konfigurera pinkod, mönster eller lösenord diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml index 0a626ef..4c32688 100644 --- a/res/values-ta-rIN/strings.xml +++ b/res/values-ta-rIN/strings.xml @@ -77,5 +77,10 @@ கைரேகையைச் சேர்க்கவும் திரைப் பூட்டை அமை %1$s SIM கண்டறியப்பட்டது. + + + மொபைலைப் பாதுகாக்கவும் + திரையை திறக்க பின், வடிவம் அல்லது கடவுச்சொல் கேட்கும்படி அமைத்து, சாதனத்தைப் பாதுகாக்கலாம் + பின், வடிவம் அல்லது கடவுச்சொல்லை அமை diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml index e3a05c6..a49a9a8 100644 --- a/res/values-te-rIN/strings.xml +++ b/res/values-te-rIN/strings.xml @@ -77,5 +77,10 @@ మీ వేలిముద్రను జోడించండి సెటప్ స్క్రీన్ లాక్ %1$s SIM కనుగొనబడింది + + + మీ ఫోన్‌ను రక్షించుకోండి + ఈ పరికరాన్ని రక్షించండి మరియు స్క్రీన్‌ను అన్‌లాక్ చేయడానికి PIN, నమూనా లేదా పాస్‌వర్డ్ అవసరమయ్యేలా ఏర్పాటు చేయండి + PIN, నమూనా లేదా పాస్‌వర్డ్‌ను సెటప్ చేయి diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 5241b1e..272b0a9 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -78,5 +78,10 @@ เพิ่มลายนิ้วมือของคุณ ตั้งค่าการล็อคหน้าจอ ตรวจพบซิม %1$s + + + ปกป้องโทรศัพท์ของคุณ + ปกป้องอุปกรณ์นี้และกำหนดให้มีการใช้ PIN, รูปแบบ หรือรหัสผ่านเพื่อปลดล็อกหน้าจอ + ตั้งค่า PIN, รูปแบบ หรือรหัสผ่าน diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index cedc935..e9de04d 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -78,5 +78,10 @@ Parmak izinizi ekleyin Ekran kilidini kurun %1$s SIM tespit edildi + + + Telefonunuzu koruyun + Bu cihazı koruyun ve ekran kilidini açmak için bir PIN, desen ya da şifreyi gerekli kılın. + PIN, desen veya şifre ayarla diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 85f42f0..6688e1f 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -78,5 +78,10 @@ Thêm vân tay của bạn Thiết lập khóa màn hình Đã phát hiện %1$s SIM + + + Bảo vệ điện thoại của bạn + Bảo vệ thiết bị này và yêu cầu mã PIN, hình hoặc mật khẩu để mở khóa màn hình + Thiết lập mã PIN, hình hoặc mật khẩu diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 7883355..b4dbd4a 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -79,6 +79,11 @@ 添加您的指纹 设置屏幕锁定 检测到 %1$s SIM 卡 + + + 为您的手机启用保护功能 + 为此设备启用保护功能，并要求输入 PIN 码、图案或密码才能解锁屏幕 + 设置 PIN、图案或密码 您的设备已经准备好使用模块 模块使您的手机更快、更智能并且更容易使用。在此指南中，您可以探索新的模块，学习它们做些什么，以及启用或禁用它们。 diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 7b43a40..3ba79c1 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -70,5 +70,10 @@ 新增你的指紋感應 設置螢幕鎖定 檢測到 %1$s 張 SIM 卡 + + + 保護您的手機 + 保護這個裝置，並要求使用 PIN、解鎖圖形或密碼解除螢幕鎖定 + 設定 PIN、解鎖圖形或密碼 diff --git a/res/values/strings.xml b/res/values/strings.xml index 80b8e2d..47d72e5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -97,8 +97,16 @@ Setup screen lock %1$s SIM detected + + Select screen lock type + How would you like to lock your screen? + Protect your phone + Protect this device and require a PIN, pattern, or password to unlock the screen + Set up PIN, pattern or password + Your device is MOD Ready Mods make your phone faster, smarter, and easier to use. In this guide, you can discover new mods, learn what they do, and enable or disable them. Explore MOD Guide + diff --git a/src/com/cyanogenmod/setupwizard/SetupWizardApp.java b/src/com/cyanogenmod/setupwizard/SetupWizardApp.java index e278821..a327b38 100644 --- a/src/com/cyanogenmod/setupwizard/SetupWizardApp.java +++ b/src/com/cyanogenmod/setupwizard/SetupWizardApp.java @@ -43,6 +43,7 @@ public class SetupWizardApp extends Application { public static final String ACTION_VIEW_LEGAL = "cyanogenmod.intent.action.LEGALESE"; public static final String ACTION_SETUP_FINGERPRINT = "android.settings.FINGERPRINT_SETUP"; + public static final String ACTION_SETUP_LOCKSCREEN = "com.android.settings.SETUP_LOCK_SCREEN"; public static final String EXTRA_FIRST_RUN = "firstRun"; public static final String EXTRA_ALLOW_SKIP = "allowSkip"; @@ -76,6 +77,7 @@ public class SetupWizardApp extends Application { public static final int REQUEST_CODE_UNLOCK = 6; public static final int REQUEST_CODE_SETUP_FINGERPRINT = 7; public static final int REQUEST_CODE_VENDOR_SETUP_GMS = 8; + public static final int REQUEST_CODE_SETUP_LOCKSCREEN = 9; public static final int RADIO_READY_TIMEOUT = 10 * 1000; diff --git a/src/com/cyanogenmod/setupwizard/cmstats/SetupStats.java b/src/com/cyanogenmod/setupwizard/cmstats/SetupStats.java index 6eb527f..f3a47b3 100644 --- a/src/com/cyanogenmod/setupwizard/cmstats/SetupStats.java +++ b/src/com/cyanogenmod/setupwizard/cmstats/SetupStats.java @@ -157,6 +157,7 @@ public class SetupStats { public static final String SLOT = "slot"; public static final String TOTAL_TIME = "total_time"; public static final String FINGERPRINT_SETUP = "fingerprint_setup"; + public static final String LOCKSCREEN_SETUP = "lockscreen_setup"; } } diff --git a/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java b/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java index 86cabd4..03f4ffd 100644 --- a/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java +++ b/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java @@ -75,6 +75,8 @@ public class CMSetupWizardData extends AbstractSetupData { } if (SetupWizardUtils.hasFingerprint(mContext) && SetupWizardUtils.isOwner()) { pages.add(new FingerprintSetupPage(mContext, this)); + } else if (SetupWizardUtils.frpEnabled(mContext)) { + pages.add(new ScreenLockSetupPage(mContext, this)); } pages.add(new CyanogenSettingsPage(mContext, this)); pages.add(new OtherSettingsPage(mContext, this).setHidden(!hasGMS)); diff --git a/src/com/cyanogenmod/setupwizard/setup/ScreenLockSetupPage.java b/src/com/cyanogenmod/setupwizard/setup/ScreenLockSetupPage.java new file mode 100644 index 0000000..3c9da33 --- /dev/null +++ b/src/com/cyanogenmod/setupwizard/setup/ScreenLockSetupPage.java @@ -0,0 +1,116 @@ +/* + * Copyright (C) 2013 The CyanogenMod Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.cyanogenmod.setupwizard.setup; + +import android.app.Activity; +import android.app.ActivityOptions; +import android.app.Fragment; +import android.app.FragmentManager; +import android.content.Context; +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.widget.TextView; +import com.cyanogenmod.setupwizard.R; +import com.cyanogenmod.setupwizard.SetupWizardApp; +import com.cyanogenmod.setupwizard.cmstats.SetupStats; +import com.cyanogenmod.setupwizard.ui.SetupPageFragment; + +public class ScreenLockSetupPage extends SetupPage { + + private static final String TAG = "ScreenLockSetupPage"; + + public ScreenLockSetupPage(Context context, SetupDataCallbacks callbacks) { + super(context, callbacks); + } + + @Override + public Fragment getFragment(FragmentManager fragmentManager, int action) { + Fragment fragment = fragmentManager.findFragmentByTag(getKey()); + if (fragment == null) { + Bundle args = new Bundle(); + args.putString(Page.KEY_PAGE_ARGUMENT, getKey()); + args.putInt(Page.KEY_PAGE_ACTION, action); + fragment = new LockscreenSetupFragment(); + fragment.setArguments(args); + } + return fragment; + } + + @Override + public int getNextButtonTitleResId() { + return R.string.skip; + } + + @Override + public String getKey() { + return TAG; + } + + @Override + public int getTitleResId() { + return R.string.lockscreen_setup_title; + } + + @Override + public boolean onActivityResult(int requestCode, int resultCode, Intent data) { + if (SetupWizardApp.REQUEST_CODE_SETUP_LOCKSCREEN == requestCode) { + if (resultCode == Activity.RESULT_OK || resultCode == Activity.RESULT_FIRST_USER) { + getCallbacks().onNextPage(); + } + } + return true; + } + + public static class LockscreenSetupFragment extends SetupPageFragment { + + private TextView mSetupLockscreen; + + @Override + protected void initializePage() { + mSetupLockscreen = (TextView) mRootView.findViewById(R.id.setup_lockscreen); + mSetupLockscreen.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + launchLockscreenSetup(); + } + }); + } + + @Override + protected int getLayoutResource() { + return R.layout.setup_lockscreen; + } + + private void launchLockscreenSetup() { + Intent intent = new Intent(SetupWizardApp.ACTION_SETUP_LOCKSCREEN); + intent.putExtra(SetupWizardApp.EXTRA_TITLE, + getString(R.string.settings_lockscreen_setup_title)); + intent.putExtra(SetupWizardApp.EXTRA_DETAILS, + getString(R.string.settings_lockscreen_setup_details)); + ActivityOptions options = + ActivityOptions.makeCustomAnimation(getActivity(), + android.R.anim.fade_in, + android.R.anim.fade_out); + SetupStats.addEvent(SetupStats.Categories.EXTERNAL_PAGE_LOAD, + SetupStats.Action.EXTERNAL_PAGE_LAUNCH, + SetupStats.Label.PAGE, SetupStats.Label.LOCKSCREEN_SETUP); + startActivityForResult(intent, SetupWizardApp.REQUEST_CODE_SETUP_LOCKSCREEN, + options.toBundle()); + } + } +}