diff --git a/res/layout/setup_lockscreen.xml b/res/layout/setup_lockscreen.xml
new file mode 100644
index 00000000..20f06bd4
--- /dev/null
+++ b/res/layout/setup_lockscreen.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/header" />
+
+    <FrameLayout android:id="@+id/page"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+
+        <ScrollView android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fillViewport="true">
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/PageContent">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/PageSummaryText"
+                    android:textSize="16sp"
+                    android:paddingLeft="@dimen/content_margin_left"
+                    android:layout_marginBottom="@dimen/summary_margin_bottom"
+                    android:paddingRight="@dimen/location_text_margin_right"
+                    android:text="@string/lockscreen_setup_summary" />
+
+                <TextView
+                    android:id="@+id/setup_lockscreen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/content_margin_left"
+                    android:paddingRight="@dimen/location_text_margin_right"
+                    android:gravity="center_vertical"
+                    android:textSize="16sp"
+                    android:textAllCaps="true"
+                    android:textColor="@color/accent"
+                    android:text="@string/lockscreen_setup_screen_lock_setup"/>
+
+            </LinearLayout>
+        </ScrollView>
+    </FrameLayout>
+</LinearLayout>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 3b01cac6..c1f5ee2d 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -78,6 +78,11 @@
   <string name="fingerprint_setup_add_fingerprint">Voeg jou vingerafdruk by</string>
   <string name="fingerprint_setup_screen_lock_setup">Stel skerm sluit op</string>
   <string name="sim_locale_changed">%1$s SIM opgespoor</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">Beskerm jou foon</string>
+  <string name="lockscreen_setup_summary"><b>Beskerm die toestel</b>" en vereis 'n PIN, patroon of wagwoord om skerm te ontsluit"</string>
+  <string name="lockscreen_setup_screen_lock_setup">Stel PIN, patroon of wagwoord op</string>
   <!-- MOD stuff -->
   <string name="mod_welcome">Welkom by die Post-Toep Era</string>
   <string name="mod_description">Mods is intelligente ervarings, direk ingebou in die BS. Wanneer die MOD dink dit kan help, sal dit aanbied om die ervaring te aktiveer vir jou.</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 19509d44..f60ecc7b 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -78,6 +78,11 @@
   <string name="fingerprint_setup_add_fingerprint">أضف بصمتك</string>
   <string name="fingerprint_setup_screen_lock_setup">إنشاء إقفال الشاشة</string>
   <string name="sim_locale_changed">تم اكتشاف %1$s SIM</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">حماية هاتفك</string>
+  <string name="lockscreen_setup_summary"><b>حماية هذا الجهاز</b> وطلب رقم تعريف شخصي أو نمط أو كلمة مرور لإلغاء قفل الشاشة.</string>
+  <string name="lockscreen_setup_screen_lock_setup">إعداد رقم تعريف شخصي أو نمط أو كلمة مرور</string>
   <!-- MOD stuff -->
   <string name="mod_welcome">مرحباً بكم في Post-App Era</string>
   <string name="mod_description">الأوضاع عبارة عن تجارب ذكية، ومدركة وخفيفة الوزن تم بناؤها مباشرة في نظام التشغيل OS. عندما يرى MOD أنه يمكنه المساعدة، سيقوم بتنشيطه لك.</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 6cc0e8f5..fde619a0 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -78,6 +78,11 @@
   <string name="fingerprint_setup_add_fingerprint">Добавете вашият пръстов отпечатък</string>
   <string name="fingerprint_setup_screen_lock_setup">Настройка на екрана за заключване</string>
   <string name="sim_locale_changed">Намерена %1$s СИМ карта</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">Защитете телефона си</string>
+  <string name="lockscreen_setup_summary"><b>Защитете у-вото</b> и изисквайте ПИН код, фигура или парола за отключване на екрана</string>
+  <string name="lockscreen_setup_screen_lock_setup">Настройване на ПИН код, фигура или парола</string>
   <!-- MOD stuff -->
   <string name="mod_welcome">Добре дошли в Post-App Era</string>
   <string name="mod_description">Модулите са интелигентни, леки и вградени директно в операционната система. Когато модулите смятат, че могат да помогнат те ще Ви предложат да се активират.</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index ccea77c4..7d169d27 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -78,6 +78,11 @@
   <string name="fingerprint_setup_add_fingerprint">Afegeix la teva empremta digital</string>
   <string name="fingerprint_setup_screen_lock_setup">Configuració del bloqueig de pantalla</string>
   <string name="sim_locale_changed">%1$s SIM detectada</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">Protegeix el teu telèfon</string>
+  <string name="lockscreen_setup_summary"><b>Protegeix el dispositiu</b> i estableix un PIN, un patró o una contrasenya per desbloquejar la pantalla</string>
+  <string name="lockscreen_setup_screen_lock_setup">Configura el PIN, el patró o la contrasenya</string>
   <!-- MOD stuff -->
   <string name="mod_welcome">Benvinguts a l\'Era Post-Aplicacions</string>
   <string name="mod_description">Els Mods són intel·ligents, conscients i experiències lleugeres construïts directament dins el SO. Quan un MOD pensi que et pot ajudar, s\'oferirà per activar-se.</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 7f92ef92..dc2413bd 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -78,6 +78,11 @@
   <string name="fingerprint_setup_add_fingerprint">Přidat otisk prstu</string>
   <string name="fingerprint_setup_screen_lock_setup">Nastavit zámek obrazovky</string>
   <string name="sim_locale_changed">Zjištěna %1$s SIM</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">Chraňte svůj telefon</string>
+  <string name="lockscreen_setup_summary"><b>Chránit toto zařízení</b> a před odemknutím obrazovky požadovat kód PIN, gesto nebo heslo</string>
+  <string name="lockscreen_setup_screen_lock_setup">Nastavit kód PIN, gesto nebo heslo</string>
   <!-- MOD stuff -->
   <string name="mod_welcome">Vítejte v éře Post-App</string>
   <string name="mod_description">Módy jsou inteligentní a nenáročné malé aplikace zabudované přímo do OS. Tyto MODy mohou v určitých situacích nabídnout svoji pomoc.</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index f0be03d2..22e2fc1f 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -78,6 +78,11 @@
   <string name="fingerprint_setup_add_fingerprint">Tilføje dit fingeraftryk</string>
   <string name="fingerprint_setup_screen_lock_setup">Konfigurere skærmlås</string>
   <string name="sim_locale_changed">%1$s SIM-kort fundet</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">Beskyt din telefon</string>
+  <string name="lockscreen_setup_summary"><b>Beskyt denne enhed</b>, og kræv pinkode, mønster eller adgangskode for at låse skærmen op</string>
+  <string name="lockscreen_setup_screen_lock_setup">Konfigurer pinkode, mønster eller adgangskode</string>
   <!-- MOD stuff -->
   <string name="mod_welcome">Velkommen til Post-App æraen</string>
   <string name="mod_description">Tilpasninger er intelligente, opmærksomme og gode oplevelser indbygget direkte i styresystemet. Når MOD mener den kan hjælpe, vil den tilbyde at aktivere dem for dig.</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 760323aa..bdde3bf6 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -78,6 +78,11 @@
   <string name="fingerprint_setup_add_fingerprint">Fügen Sie Ihren Fingerabdruck hinzu.</string>
   <string name="fingerprint_setup_screen_lock_setup">Die Bildschirmsperre einrichten</string>
   <string name="sim_locale_changed">%1$s SIM-Karte erkannt</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">Schützen Sie Ihr Telefon</string>
+  <string name="lockscreen_setup_summary"><b>Gerät schützen</b> und PIN, Muster oder Passwort zur Display-Entsperrung verwenden</string>
+  <string name="lockscreen_setup_screen_lock_setup">PIN, Muster oder Passwort einrichten</string>
   <!-- MOD stuff -->
   <string name="mod_welcome">Willkommen in der Post-App-Ära</string>
   <string name="mod_description">Mods sind intelligente, kontextsensitive und leichtgewichtige Anwendungen, die direkt in das Betriebssystem integriert sind. Wenn MOD der Meinung ist, dass es von Nutzen wäre, bietet es Ihnen an, die Mods für Sie zu aktivieren.</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index de8752cb..34de7e40 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -78,6 +78,11 @@
   <string name="fingerprint_setup_add_fingerprint">Προσθέστε το δακτυλικό σας αποτύπωμα</string>
   <string name="fingerprint_setup_screen_lock_setup">Ρύθμιση κλειδώματος οθόνης</string>
   <string name="sim_locale_changed">Ανιχνεύθηκε %1$s SIM</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">Προστατέψτε το τηλέφωνό σας</string>
+  <string name="lockscreen_setup_summary"><b>Προστατέψτε αυτήν τη συσκευή</b> και ζητήστε ένα PIN, ένα μοτίβο ή έναν κωδικό πρόσβασης για να ξεκλειδώσετε την οθόνη</string>
+  <string name="lockscreen_setup_screen_lock_setup">Ρύθμιση PIN, μοτίβου ή κωδικού πρόσβασης</string>
   <!-- MOD stuff -->
   <string name="mod_welcome">Καλώς ήρθατε στην εποχή μετά τις εφαρμογές</string>
   <string name="mod_description">Τα Mod είναι ευφυείς, ενήμερες και ελαφριές βελτιώσεις ενσωματωμένες κατευθείαν στο σύστημα. Όταν το MOD νομίζει ότι μπορεί να βοηθήσει, θα προσφερθεί να τα ενεργοποιήσει για εσάς.</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 66986600..84360c25 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -78,6 +78,11 @@
   <string name="fingerprint_setup_add_fingerprint">Añadir tu huella digital</string>
   <string name="fingerprint_setup_screen_lock_setup">Configurar la pantalla bloqueada</string>
   <string name="sim_locale_changed">%1$s SIM detectada</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">Protege el teléfono</string>
+  <string name="lockscreen_setup_summary"><b>Proteger dispositivo</b> y solicitar PIN/patrón/contraseña para desbloquear pantalla</string>
+  <string name="lockscreen_setup_screen_lock_setup">Configurar PIN, patrón o contraseña</string>
   <!-- MOD stuff -->
   <string name="mod_welcome">Bienvenido a la era posaplicaciones</string>
   <string name="mod_description">Las Mods son experiencias inteligentes, conscientes y ligeras construidas directamente dentro del SO. Cuando una MOD cree que te puede ayudar, se ofrecerá para activarse.</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 11ec57ae..58b67a3e 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -78,6 +78,11 @@
   <string name="fingerprint_setup_add_fingerprint">Añade tu huella digital</string>
   <string name="fingerprint_setup_screen_lock_setup">Ajustes de pantalla de bloqueo</string>
   <string name="sim_locale_changed">%1$s SIM detectada</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">Protege tu teléfono</string>
+  <string name="lockscreen_setup_summary"><b>Proteger este dispositivo</b> y establecer un PIN, un patrón o una contraseña para desbloquear la pantalla</string>
+  <string name="lockscreen_setup_screen_lock_setup">Configurar PIN, patrón o contraseña</string>
   <!-- MOD stuff -->
   <string name="mod_welcome">Bienvenido a la era Post-Aplicaciones</string>
   <string name="mod_description">Los Mods son experiencias inteligentes, conscientes y ligeras construidas directamente dentro del SO. Cuando un MOD piensa que te puede ayudar, se ofrecerá para activarse.</string>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index ba6925a4..d049ddf1 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -78,6 +78,11 @@
   <string name="fingerprint_setup_add_fingerprint">Gehitu zure hatz-marka</string>
   <string name="fingerprint_setup_screen_lock_setup">Ezarri pantaila blokeoa</string>
   <string name="sim_locale_changed">%1$s SIM antzeman da</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">Babestu telefonoa</string>
+  <string name="lockscreen_setup_summary"><b>Babestu gailua</b> eta eskatu PIN kode, eredu edo pasahitz bat pantaila desblokeatzeko</string>
+  <string name="lockscreen_setup_screen_lock_setup">Konfiguratu PIN kodea, eredua edo pasahitza</string>
   <!-- MOD stuff -->
   <string name="mod_welcome">Ongi etorri aplikazioen osteko garaira</string>
   <string name="mod_description">Mod-ak zuzenean sistema eragilean eraikitako esperienzia adimentsu, jakitun eta arinak dira. Mod batek lagundu dezakeela uste duenean aktibatzea eskainiko dizu.</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 0bce1a5a..d927f0c2 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -78,6 +78,11 @@
   <string name="fingerprint_setup_add_fingerprint">Lisää sormenjälkesi</string>
   <string name="fingerprint_setup_screen_lock_setup">Aseta näytön lukitus</string>
   <string name="sim_locale_changed">%1$s SIM tunnistettu</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">Suojaa puhelintasi</string>
+  <string name="lockscreen_setup_summary"><b>Suojaa laitetta</b> avaamalla näytön lukitus PIN-koodin, kuvion tai salasanan avulla</string>
+  <string name="lockscreen_setup_screen_lock_setup">Aseta PIN-koodi, kuvio tai salasana</string>
   <!-- MOD stuff -->
   <string name="mod_welcome">Tervetuloa Post-App-aikakaudelle</string>
   <string name="mod_description">Modit ovat älykkäitä, tietoisia ja kevyitä kokemuksia jotka on sisäänrakennettuna käyttöjärjestelmään. Kun MOD ajattelee voivansa auttaa, se ehdottaa voivansa aktivoida ne puolestasi.</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index fb9aa7a6..5682a700 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -78,6 +78,11 @@
   <string name="fingerprint_setup_add_fingerprint">Ajouter votre empreinte digitale</string>
   <string name="fingerprint_setup_screen_lock_setup">Configurer le verrouillage de l\'écran</string>
   <string name="sim_locale_changed">%1$s carte SIM détectée</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">Protéger votre téléphone</string>
+  <string name="lockscreen_setup_summary"><b>"Protéger l'appareil"</b>" et exiger code, schéma ou mot de passe pour déverrouiller l'écran"</string>
+  <string name="lockscreen_setup_screen_lock_setup">Configurer un code, un schéma ou un mot de passe</string>
   <!-- MOD stuff -->
   <string name="mod_welcome">Bienvenue dans l\'ère post-applications</string>
   <string name="mod_description">Les Mods sont des fonctionnalités intelligentes, conscientes et légères construites directement dans le système d\'exploitation. Lorsque le MOD pense pouvoir vous aider, il vous proposera de les activer à votre place.</string>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index 1656419a..92282f1d 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -78,5 +78,10 @@
   <string name="fingerprint_setup_add_fingerprint">તમારી ફિંગરપ્રિન્ટ ઉમેરો</string>
   <string name="fingerprint_setup_screen_lock_setup">સ્ક્રીન લૉક સેટઅપ કરો</string>
   <string name="sim_locale_changed">%1$s SIM સૂચિત</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">તમારા ફોનને સુરક્ષિત કરો</string>
+  <string name="lockscreen_setup_summary"><b>આ ઉપકરણને સુરક્ષિત કરો</b> અને સ્ક્રીનને અનલૉક કરવા માટે PIN, પેટર્ન અથવા પાસવર્ડ જરૂરી</string>
+  <string name="lockscreen_setup_screen_lock_setup">PIN, પેટર્ન અથવા પાસવર્ડ સેટ કરો</string>
   <!-- MOD stuff -->
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index b85fd441..d8f657ff 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -78,6 +78,11 @@
   <string name="fingerprint_setup_add_fingerprint">Dodajte svoj ​​otisak</string>
   <string name="fingerprint_setup_screen_lock_setup">Postavljanje zaključavanja zaslona</string>
   <string name="sim_locale_changed">%1$s SIM otkriven</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">Zaštitite svoj telefon</string>
+  <string name="lockscreen_setup_summary"><b>Zaštiti uređaj</b> i zahtijevaj PIN, uzorak ili zaporku za otključavanje zaslona</string>
+  <string name="lockscreen_setup_screen_lock_setup">Postavi PIN, uzorak ili zaporku</string>
   <!-- MOD stuff -->
   <string name="mod_welcome">Dobro došli u Post-App eru</string>
   <string name="mod_description">Modovi su inteligentni, svjesni, laganim iskustvom ugrađeni izravno u OS. Kada MOD misli da može pomoći, ponudit će da vam ih aktivira.</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index b5d5f966..45270fca 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -78,5 +78,10 @@
   <string name="fingerprint_setup_add_fingerprint">Adja hozzá ujjlenyomatát</string>
   <string name="fingerprint_setup_screen_lock_setup">Képernyőzár beállítása</string>
   <string name="sim_locale_changed">%1$s SIM észlelve</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">Óvja meg telefonját</string>
+  <string name="lockscreen_setup_summary"><b>Óvja meg eszközét</b>, és a képernyőzár feloldásához állítson be PIN kódot, mintát vagy jelszót.</string>
+  <string name="lockscreen_setup_screen_lock_setup">PIN kód, minta vagy jelszó beállítása</string>
   <!-- MOD stuff -->
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index de0e8ad7..99a2e0eb 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -78,6 +78,11 @@
   <string name="fingerprint_setup_add_fingerprint">Tambahkan sidik jari Anda</string>
   <string name="fingerprint_setup_screen_lock_setup">Siapkan kunci layar</string>
   <string name="sim_locale_changed">%1$s SIM terdeteksi</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">Lindungi ponsel</string>
+  <string name="lockscreen_setup_summary"><b>Lindungi perangkat ini</b> dan minta PIN, pola, atau sandi untuk membuka kunci layar</string>
+  <string name="lockscreen_setup_screen_lock_setup">Siapkan PIN, pola, atau sandi</string>
   <!-- MOD stuff -->
   <string name="mod_welcome">Selamat datang di Era Pasca-Aplikasi</string>
   <string name="mod_description">Mod itu cerdas, sadar, dan merupakan pengalaman ringan yang terintegrasi dengan sistem operasi. Jika MOD berpikir bahwa ia dapat membantu, ia dapat menawarkan pengaktifan fitur bagi Anda.</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 3bacdebc..4be7fc2f 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -78,6 +78,11 @@
   <string name="fingerprint_setup_add_fingerprint">Aggiungere un\'impronta</string>
   <string name="fingerprint_setup_screen_lock_setup">Imposta una schermata di blocco</string>
   <string name="sim_locale_changed">%1$s SIM rilevata</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">Proteggi il tuo telefono</string>
+  <string name="lockscreen_setup_summary"><b>Proteggi il dispositivo</b> e richiedi PIN, sequenza o password per sbloccare schermo</string>
+  <string name="lockscreen_setup_screen_lock_setup">Configura PIN, sequenza o password</string>
   <!-- MOD stuff -->
   <string name="mod_welcome">Benvenuti nell\'Era Post-App</string>
   <string name="mod_description">Le MOD sono funzioni intelligenti, consapevoli e leggere costruite direttamente nel sistema. Quando una MOD pensa di essere d\'aiuto, si offrirà di attivare delle funzioni per te.</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 916a5f9d..b545b668 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -78,6 +78,11 @@
   <string name="fingerprint_setup_add_fingerprint">הוסף את טביעת האצבע שלך</string>
   <string name="fingerprint_setup_screen_lock_setup">הגדרת מסך נעילה</string>
   <string name="sim_locale_changed">זוהו %1$s כרטיסי SIM</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">הגן על הטלפון שלך</string>
+  <string name="lockscreen_setup_summary"><b>הגן על מכשיר זה</b> ודרוש קוד אימות, קו או סיסמה לביטול נעילת המסך.</string>
+  <string name="lockscreen_setup_screen_lock_setup">‏הגדר PIN, קו ביטול נעילה או סיסמה</string>
   <!-- MOD stuff -->
   <string name="mod_welcome">ברוכים הבאים לעידן הפוסט-יישום</string>
   <string name="mod_description">תוספים הם חוויות אינטליגנטיות, מודעות וקלות, שנבנו לתוך מערכת ההפעלה. כאשר תוסף חושב שביכולתו לסייע למשתמש/ת, הוא יציע לך להפעיל את עצמו למענך.</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index fb8487f9..38a1d067 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -78,6 +78,11 @@
   <string name="fingerprint_setup_add_fingerprint">指紋を追加</string>
   <string name="fingerprint_setup_screen_lock_setup">画面のロックをセットアップ</string>
   <string name="sim_locale_changed">%1$sのSIMを検出しました</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">スマートフォンの保護</string>
+  <string name="lockscreen_setup_summary"><b>この端末を保護</b>し、画面のロック解除にPIN、パターン、またはパスワードを必要とする</string>
+  <string name="lockscreen_setup_screen_lock_setup">PIN、パターン、またはパスワードの設定</string>
   <!-- MOD stuff -->
   <string name="mod_welcome">Post-App Eraへようこそ</string>
   <string name="mod_description">MODはOSに直接組み込まれたスマートで、物分りが良く、軽量なエクスペリアンスです。MODが役に立つと考えたときは、MODを有効にすることを提案します。</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 8db912f3..7ead15cf 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -78,5 +78,10 @@
   <string name="fingerprint_setup_add_fingerprint">ನಿಮ್ಮ ಫಿಂಗರ್‍ಪ್ರಿಂಟನ್ನು ಸೇರಿಸಿ</string>
   <string name="fingerprint_setup_screen_lock_setup">ಪರದೆ ಲಾಕ್ ಸೆಟಪ್ ಮಾಡಿ</string>
   <string name="sim_locale_changed">%1$s SIM ಗುರುತಿಸಲ್ಪಟ್ಟಿದೆ</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">ನಿಮ್ಮ ಫೋನನ್ನು ರಕ್ಷಿಸಿ</string>
+  <string name="lockscreen_setup_summary"><b>ಸಾಧನ ರಕ್ಷಿಸಿ</b>. ಸ್ಕ್ರೀನ್‌ ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಪಿನ್, ಪ್ಯಾಟರ್ನ್, ಪಾಸ್‌ವರ್ಡ್ ಬೇಕಾಗುತ್ತದೆ</string>
+  <string name="lockscreen_setup_screen_lock_setup">ಪಿನ್, ನಮೂನೆ ಅಥವಾ ಪಾಸ್‌ವರ್ಡ್‌ ಹೊಂದಿಸಿ</string>
   <!-- MOD stuff -->
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index f586ebf0..d5839513 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -79,6 +79,11 @@
   <string name="fingerprint_setup_add_fingerprint">지문 추가</string>
   <string name="fingerprint_setup_screen_lock_setup">화면 잠금 설정</string>
   <string name="sim_locale_changed">%1$s SIM 인식됨</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">휴대전화 보호</string>
+  <string name="lockscreen_setup_summary"><b>이 기기를 보호</b>하고 화면 잠금 해제용 PIN, 패턴 또는 비밀번호 요청</string>
+  <string name="lockscreen_setup_screen_lock_setup">PIN, 패턴 또는 비밀번호 설정하기</string>
   <!-- MOD stuff -->
   <string name="mod_welcome">앱 이전 시대에 오신 것을 환영합니다</string>
   <string name="mod_description">Mod는 운영 체제에 내장된 지능형이고, 인식할 수 있으며 가벼운 경험입니다. Mod가 도울 수 있다고 생각하면, 당신이 활성화할 수 있도록 제공할 것입니다.</string>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index b956f272..ad61d384 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -78,5 +78,10 @@
   <string name="fingerprint_setup_add_fingerprint">നിങ്ങളുടെ വിരലടയാളം ചേർക്കുക</string>
   <string name="fingerprint_setup_screen_lock_setup">സ്ക്രീൻ ലോക്ക് സജ്ജമാക്കുക</string>
   <string name="sim_locale_changed">%1$s SIM കണ്ടെത്തി</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">നിങ്ങളുടെ ഫോൺ പരിരക്ഷിക്കുക</string>
+  <string name="lockscreen_setup_summary"><b>ഈ ഉപകരണം പരിരക്ഷിക്കുക</b>, സ്‌ക്രീൻ അൺലോക്കുചെയ്യാൻ പിൻ,പാറ്റേൺ അല്ലെങ്കിൽ പാസ്‌വേഡ് ആവശ്യമാണ്</string>
+  <string name="lockscreen_setup_screen_lock_setup">പിൻ, പാറ്റേൺ അല്ലെങ്കിൽ പാസ്‌വേഡ് സജ്ജമാക്കുക</string>
   <!-- MOD stuff -->
 </resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 75d84bf6..ecc3d871 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -78,5 +78,10 @@
   <string name="fingerprint_setup_add_fingerprint">तुमचा बोटाचा ठसा जोडा</string>
   <string name="fingerprint_setup_screen_lock_setup">स्क्रीन लॉक सेटअप करा</string>
   <string name="sim_locale_changed">%1$s सिम आढळले</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">आपला फोन संरक्षित करा</string>
+  <string name="lockscreen_setup_summary"><b>हे डिव्हाइस संरक्षित करा</b> आणि स्क्रीन अनलॉक करण्यासाठी पिन, नमुना किंवा संकेतशब्द आवश्यक आहे</string>
+  <string name="lockscreen_setup_screen_lock_setup">पिन, नमुना किंवा संकेतशब्द सेट करा</string>
   <!-- MOD stuff -->
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index a5011b84..1d759cec 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -78,6 +78,11 @@
   <string name="fingerprint_setup_add_fingerprint">Legge til fingeravtrykket ditt</string>
   <string name="fingerprint_setup_screen_lock_setup">Konfigurere skjermlås</string>
   <string name="sim_locale_changed">%1$s SIM oppdaget</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">Beskytt telefonen</string>
+  <string name="lockscreen_setup_summary"><b>Beskytt denne enheten</b> og krev PIN-kode, mønster eller passord for å låse opp skjermen</string>
+  <string name="lockscreen_setup_screen_lock_setup">Konfigurer PIN-kode, mønster eller passord</string>
   <!-- MOD stuff -->
   <string name="mod_welcome">Velkommen til Post-App Era</string>
   <string name="mod_description">Mods er intelligente, godtvitende og små erfaringer bygget direkte inn i OSet. Når MOD tenker at den kan hjelpe, vil den anbefale deg å slå den på.</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index e77d5b13..2da72b36 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -78,5 +78,10 @@
   <string name="fingerprint_setup_add_fingerprint">Uw vingerafdruk toe te voegen</string>
   <string name="fingerprint_setup_screen_lock_setup">Schermvergrendeling in te stellen</string>
   <string name="sim_locale_changed">%1$s simkaart gedetecteerd</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">Bescherm je telefoon</string>
+  <string name="lockscreen_setup_summary"><b>Bescherm dit apparaat</b> en vraag om een pincode, patroon of wachtwoord om het scherm te ontgrendelen</string>
+  <string name="lockscreen_setup_screen_lock_setup">Pincode, patroon of wachtwoord instellen</string>
   <!-- MOD stuff -->
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 9730f503..9134f853 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -78,5 +78,10 @@
   <string name="fingerprint_setup_add_fingerprint">Dodać swój odcisk palca</string>
   <string name="fingerprint_setup_screen_lock_setup">Skonfigurować blokadę ekranu</string>
   <string name="sim_locale_changed">Wykryto %1$s SIM</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">Zabezpiecz telefon</string>
+  <string name="lockscreen_setup_summary"><b>Zabezpiecz to urządzenie</b>, wymagając kodu PIN, wzoru lub hasła do odblokowania ekranu</string>
+  <string name="lockscreen_setup_screen_lock_setup">Ustaw PIN, wzorzec lub hasło</string>
   <!-- MOD stuff -->
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 87e5cf91..3d8ddd46 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -78,6 +78,11 @@
   <string name="fingerprint_setup_add_fingerprint">Adicionar sua impressão digital</string>
   <string name="fingerprint_setup_screen_lock_setup">Configuração de bloqueio de tela</string>
   <string name="sim_locale_changed">Cartão SIM %1$s detectado</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">Proteger seu smartphone</string>
+  <string name="lockscreen_setup_summary"><b>Proteger este dispositivo</b> e pedir PIN, padrão ou senha para desbloquear a tela</string>
+  <string name="lockscreen_setup_screen_lock_setup">Configurar PIN, padrão ou senha</string>
   <!-- MOD stuff -->
   <string name="mod_welcome">Bem-vindo à Era Pós-Aplicativos</string>
   <string name="mod_description">Mods são experiências inteligentes, conscientes e leves incluídas diretamente no sistema operacional. Quando uma MOD acha que pode ajudar, ela se oferece para ativar para você.</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 84485125..1cdb5518 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -78,6 +78,11 @@
   <string name="fingerprint_setup_add_fingerprint">Adicionar a sua impressão digital</string>
   <string name="fingerprint_setup_screen_lock_setup">Configuração do ecrã de bloqueio</string>
   <string name="sim_locale_changed">Cartão SIM %1$s detetado</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">Proteger o seu telemóvel</string>
+  <string name="lockscreen_setup_summary"><b>Proteja este disp.</b> e exija um PIN, seq. ou palavra-passe para desbloq. o ecrã</string>
+  <string name="lockscreen_setup_screen_lock_setup">Configurar PIN, sequência ou palavra-passe</string>
   <!-- MOD stuff -->
   <string name="mod_welcome">Bem-vindo à Era Pós-Aplicação</string>
   <string name="mod_description">Os Mods são experiências inteligentes, conscientes e leves inseridas diretamente no SO. Quando um MOD achar que poderá ajudá-lo, irá oferecer-se para ativá-los para si.</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index eb0e9823..63b41ab6 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -73,5 +73,10 @@
   <string name="fingerprint_setup_add_fingerprint">Adăugați-vă amprenta</string>
   <string name="fingerprint_setup_screen_lock_setup">Setați blocarea de ecran</string>
   <string name="sim_locale_changed">SIM %1$s detectat</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">Protejați telefonul</string>
+  <string name="lockscreen_setup_summary"><b>Protejați dispozitivul</b> cu PIN, model sau parolă necesară pt. a debloca ecranul</string>
+  <string name="lockscreen_setup_screen_lock_setup">Configurați codul PIN, modelul sau parola</string>
   <!-- MOD stuff -->
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 5f8dc6c6..a4e00932 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -78,6 +78,11 @@
   <string name="fingerprint_setup_add_fingerprint">Добавить ваши отпечатки</string>
   <string name="fingerprint_setup_screen_lock_setup">Настроить экран блокировки</string>
   <string name="sim_locale_changed">Обнаружена %1$s SIM-карта</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">Защитите телефон</string>
+  <string name="lockscreen_setup_summary"><b>Защитить устройство</b> и запрашивать PIN-код, графический ключ или пароль</string>
+  <string name="lockscreen_setup_screen_lock_setup">Добавить PIN-код, графический ключ или пароль</string>
   <!-- MOD stuff -->
   <string name="mod_welcome">Добро пожаловать в эпоху встроенных приложений</string>
   <string name="mod_description">Моды — это интеллектуальные, контекстно-зависимые и легкие приложения, интегрированные непосредственно в операционную систему. Если MOD полагает, что вам нужна помощь, вам будет предложено активировать мод.</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index d1ca1d30..9d9ddc0c 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -78,6 +78,11 @@
   <string name="fingerprint_setup_add_fingerprint">Dodati svoj prstni odtis</string>
   <string name="fingerprint_setup_screen_lock_setup">Nastaviti zaklepanje zaslona</string>
   <string name="sim_locale_changed">%1$s kartica SIM zaznana</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">Zaščitite telefon</string>
+  <string name="lockscreen_setup_summary"><b>Zaščiti napravo</b> in za odklenitev zaslona zahtevaj kodo PIN, vzorec ali geslo</string>
+  <string name="lockscreen_setup_screen_lock_setup">Nastavi kodo PIN, vzorec ali geslo</string>
   <!-- MOD stuff -->
   <string name="mod_welcome">Dobrodošli v dobo vgrajenih aplikacij</string>
   <string name="mod_description">Modifikacije so inteligentne, dovzetne in lahke izkušnje, ki so vgrajene neposredno v OS. Ko MOD misli, da lahko pomaga, vam bo ponudil, da jih omogočite.</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 84a016e4..0e9b5feb 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -78,6 +78,11 @@
   <string name="fingerprint_setup_add_fingerprint">Додај свој отисак</string>
   <string name="fingerprint_setup_screen_lock_setup">Подешавање закључавања екрана</string>
   <string name="sim_locale_changed">Откривен %1$s SIM</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">Заштитите телефон</string>
+  <string name="lockscreen_setup_summary"><b>Заштитите уређај</b> и поставите PIN, шаблон или лозинку за откључавање екрана</string>
+  <string name="lockscreen_setup_screen_lock_setup">Подеси PIN, шаблон или лозинку</string>
   <!-- MOD stuff -->
   <string name="mod_welcome">Добродошли у доба после апликација</string>
   <string name="mod_description">Режими су интелигентна, свесна и лагана искуства уграђена директно у ОС. Када режим мисли да може помоћи, он ће понудити да активира то за вас.</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 16a134f6..4bc83982 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -78,5 +78,10 @@
   <string name="fingerprint_setup_add_fingerprint">Lägga till ditt fingeravtryck</string>
   <string name="fingerprint_setup_screen_lock_setup">Konfigurera skärmlås</string>
   <string name="sim_locale_changed">%1$s SIM upptäckt</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">Skydda mobilen</string>
+  <string name="lockscreen_setup_summary"><b>Skydda den här enheten</b> och kräv pinkod, mönster eller lösenord för att låsa upp skärmen</string>
+  <string name="lockscreen_setup_screen_lock_setup">Konfigurera pinkod, mönster eller lösenord</string>
   <!-- MOD stuff -->
 </resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 11a8acb2..e4f1dbb5 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -78,5 +78,10 @@
   <string name="fingerprint_setup_add_fingerprint">கைரேகையைச் சேர்க்கவும்</string>
   <string name="fingerprint_setup_screen_lock_setup">திரைப் பூட்டை அமை</string>
   <string name="sim_locale_changed">%1$s SIM கண்டறியப்பட்டது.</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">மொபைலைப் பாதுகாக்கவும்</string>
+  <string name="lockscreen_setup_summary">திரையை திறக்க பின், வடிவம் அல்லது கடவுச்சொல் கேட்கும்படி அமைத்து, <b>சாதனத்தைப் பாதுகாக்கலாம்</b></string>
+  <string name="lockscreen_setup_screen_lock_setup">பின், வடிவம் அல்லது கடவுச்சொல்லை அமை</string>
   <!-- MOD stuff -->
 </resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 46cd3528..5cb8057b 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -78,5 +78,10 @@
   <string name="fingerprint_setup_add_fingerprint">మీ వేలిముద్రను జోడించండి</string>
   <string name="fingerprint_setup_screen_lock_setup">సెటప్ స్క్రీన్ లాక్</string>
   <string name="sim_locale_changed">%1$s SIM కనుగొనబడింది</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">మీ ఫోన్‌ను రక్షించుకోండి</string>
+  <string name="lockscreen_setup_summary"><b>ఈ పరికరాన్ని రక్షించండి</b> మరియు స్క్రీన్‌ను అన్‌లాక్ చేయడానికి PIN, నమూనా లేదా పాస్‌వర్డ్ అవసరమయ్యేలా ఏర్పాటు చేయండి</string>
+  <string name="lockscreen_setup_screen_lock_setup">PIN, నమూనా లేదా పాస్‌వర్డ్‌ను సెటప్ చేయి</string>
   <!-- MOD stuff -->
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 2df80116..c2639b1a 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -78,6 +78,11 @@
   <string name="fingerprint_setup_add_fingerprint">เพิ่มลายนิ้วมือของคุณ</string>
   <string name="fingerprint_setup_screen_lock_setup">ตั้งค่าการล็อคหน้าจอ</string>
   <string name="sim_locale_changed">ตรวจพบซิม %1$s</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">ปกป้องโทรศัพท์ของคุณ</string>
+  <string name="lockscreen_setup_summary"><b>ปกป้องอุปกรณ์นี้</b>และกำหนดให้มีการใช้ PIN, รูปแบบ หรือรหัสผ่านเพื่อปลดล็อกหน้าจอ</string>
+  <string name="lockscreen_setup_screen_lock_setup">ตั้งค่า PIN, รูปแบบ หรือรหัสผ่าน</string>
   <!-- MOD stuff -->
   <string name="mod_welcome">ขอต้อนรับสู่ Post-App Era</string>
   <string name="mod_description">Mods คือประสบการณ์อันชาญฉลาด รอบรู้ และมีน้ำหนักเบา ซึ่งถูกสร้างขึ้นโดยตรงในระบบปฏิบัติการ เมื่อ MOD คิดว่าสามารถช่วยได้ โปรแกรมจะเปิดใช้งานความช่วยดังกล่าวให้คุณ</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index f26295ad..701c4881 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -78,6 +78,11 @@
   <string name="fingerprint_setup_add_fingerprint">Parmak izinizi ekleyin</string>
   <string name="fingerprint_setup_screen_lock_setup">Ekran kilidini kurun</string>
   <string name="sim_locale_changed">%1$s SIM tespit edildi</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">Telefonunuzu koruyun</string>
+  <string name="lockscreen_setup_summary"><b>Bu cihazı koruyun</b> ve ekran kilidini açmak için bir PIN, desen ya da şifreyi gerekli kılın.</string>
+  <string name="lockscreen_setup_screen_lock_setup">PIN, desen veya şifre ayarla</string>
   <!-- MOD stuff -->
   <string name="mod_welcome">Uygulama Sonrası Dönem\'e Hoş Geldiniz</string>
   <string name="mod_description">Modlar akıllı ve farkındadır ve hafif deneyimler doğrudan OS\'a kurulur. MOD yardım edebileceğini düşündüğünde, size bunları etkinleştirmeyi teklif eder.</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index e722d438..7fcbef40 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -78,6 +78,11 @@
   <string name="fingerprint_setup_add_fingerprint">Thêm vân tay của bạn</string>
   <string name="fingerprint_setup_screen_lock_setup">Thiết lập khóa màn hình</string>
   <string name="sim_locale_changed">Đã phát hiện %1$s SIM</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">Bảo vệ điện thoại của bạn</string>
+  <string name="lockscreen_setup_summary"><b>Bảo vệ thiết bị này</b> và yêu cầu mã PIN, hình hoặc mật khẩu để mở khóa màn hình</string>
+  <string name="lockscreen_setup_screen_lock_setup">Thiết lập mã PIN, hình hoặc mật khẩu</string>
   <!-- MOD stuff -->
   <string name="mod_welcome">Chào mừng đến với Post-App Era</string>
   <string name="mod_description">Mod là trải nghiệm thông minh, có nhận thức và trọng lượng nhẹ được tích hợp trực tiếp vào hệ điều hành. Khi MOD cho rằng nó có thể hỗ trợ, nó sẽ cung cấp để kích hoạt chúng cho bạn.</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index c294eff7..66815ed4 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -78,6 +78,11 @@
   <string name="fingerprint_setup_add_fingerprint">添加您的指纹</string>
   <string name="fingerprint_setup_screen_lock_setup">设置屏幕锁定</string>
   <string name="sim_locale_changed">检测到 %1$s SIM 卡</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">为您的手机启用保护功能</string>
+  <string name="lockscreen_setup_summary"><b>为此设备启用保护功能</b>，并要求输入 PIN 码、图案或密码才能解锁屏幕</string>
+  <string name="lockscreen_setup_screen_lock_setup">设置 PIN、图案或密码</string>
   <!-- MOD stuff -->
   <string name="mod_welcome">欢迎来到后应用时代</string>
   <string name="mod_description">模块是智能、有意识、轻量的体验，内置于操作系统中。当模块认为它能提供帮助时，将会自动激活并为您提供服务。</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 07f94868..770edf1b 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -71,5 +71,10 @@
   <string name="fingerprint_setup_add_fingerprint">新增你的指紋感應</string>
   <string name="fingerprint_setup_screen_lock_setup">設置螢幕鎖定</string>
   <string name="sim_locale_changed">檢測到 %1$s 張 SIM 卡</string>
+
+  <!-- secure lock screen -->
+  <string name="lockscreen_setup_title">保護您的手機</string>
+  <string name="lockscreen_setup_summary"><b>保護這個裝置</b>，並要求使用 PIN、解鎖圖形或密碼解除螢幕鎖定</string>
+  <string name="lockscreen_setup_screen_lock_setup">設定 PIN、解鎖圖形或密碼</string>
   <!-- MOD stuff -->
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 82d90aab..6d0da0d0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -96,6 +96,13 @@
     <string name="fingerprint_setup_screen_lock_setup">Setup screen lock</string>
     <string name="sim_locale_changed">%1$s SIM detected</string>
 
+    <!-- secure lock screen -->
+    <string name="settings_lockscreen_setup_title">Select screen lock type</string>
+    <string name="settings_lockscreen_setup_details">How would you like to lock your screen?</string>
+    <string name="lockscreen_setup_title">Protect your phone</string>
+    <string name="lockscreen_setup_summary"><b>Protect this device</b> and require a PIN, pattern, or password to unlock the screen</string>
+    <string name="lockscreen_setup_screen_lock_setup">Set up PIN, pattern or password</string>
+
     <!-- MOD stuff -->
     <string name="mod_welcome">Welcome to the Post-App Era</string>
     <string name="mod_description">Mods are intelligent, aware, and lightweight experiences built directly into the OS. When MOD thinks it can help, it will offer to activate them for you.</string>
diff --git a/src/com/cyanogenmod/setupwizard/SetupWizardApp.java b/src/com/cyanogenmod/setupwizard/SetupWizardApp.java
index e2788219..a327b381 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 6eb527f9..f3a47b3d 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 86cabd45..03f4ffd5 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 00000000..3c9da333
--- /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());
+        }
+    }
+}