Enroll fingerprint via SetupWizard [2/2]

Change-Id: Ieabfb0f3b789b02ddd1e17aba1eadfda52b21384
Fix incorrect retrieval of SIM Network Operator.
2015-07-10 22:44:36 -07:00 · 2015-06-29 13:05:36 -07:00 · 2015-06-19 01:04:59 +00:00 · 2015-06-18 16:57:57 +00:00 · 2015-06-17 13:56:09 -07:00 · 2015-06-15 23:26:35 +00:00
69 changed files with 943 additions and 410 deletions
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -15,6 +15,7 @@
     limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
          package="com.cyanogenmod.setupwizard"
          android:versionCode="3"
          android:sharedUserId="android.uid.system">
@@ -45,7 +46,9 @@
    <uses-permission android:name="android.permission.BACKUP" />
    <uses-permission android:name="org.whispersystems.whisperpush.permissions.REGISTER" />
    <uses-permission android:name="cyanogenmod.permission.FINISH_SETUP" />
+    <uses-permission android:name="cyanogenmod.permission.LEGALESE" />
    <uses-permission android:name="com.cyngn.cmstats.SEND_ANALYTICS" />
+    <uses-permission android:name="com.cyanogen.permission.REQUEST_KILL_SWITCH_OP" />

    <permission
        android:name="cyanogenmod.permission.PROTECTED_APP"
@@ -53,7 +56,8 @@

    <permission
        android:name="cyanogenmod.permission.FINISH_SETUP"
-        android:protectionLevel="signatureOrSystem" />
+        android:protectionLevel="signatureOrSystem"
+        androidprv:allowViaWhitelist="true" />

    <permission android:name="org.whispersystems.whisperpush.permissions.REGISTER"
                android:protectionLevel="signature" />
@@ -89,5 +93,12 @@
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
        </activity>
+
+        <receiver android:name=".setup.FinishSetupReceiver"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="com.cyanogenmod.setupwizard.ACTION_FINISH_SETUPWIZARD" />
+            </intent-filter>
+        </receiver>
    </application>
 </manifest>
--- a/res/drawable-hdpi/cross.png
+++ b/res/drawable-hdpi/cross.png
--- a/res/drawable-hdpi/tick.png
+++ b/res/drawable-hdpi/tick.png
--- a/res/drawable-mdpi/cross.png
+++ b/res/drawable-mdpi/cross.png
--- a/res/drawable-mdpi/tick.png
+++ b/res/drawable-mdpi/tick.png
--- a/res/drawable-xhdpi/cross.png
+++ b/res/drawable-xhdpi/cross.png
--- a/res/drawable-xhdpi/tick.png
+++ b/res/drawable-xhdpi/tick.png
--- a/res/drawable-xxhdpi/cross.png
+++ b/res/drawable-xxhdpi/cross.png
--- a/res/drawable-xxhdpi/tick.png
+++ b/res/drawable-xxhdpi/tick.png
--- a/res/drawable-xxxhdpi/cross.png
+++ b/res/drawable-xxxhdpi/cross.png
--- a/res/drawable-xxxhdpi/tick.png
+++ b/res/drawable-xxxhdpi/tick.png
--- a/res/drawable/ic_check_mark.xml
+++ b/res/drawable/ic_check_mark.xml
@@ -0,0 +1,26 @@
+<?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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#7ED321"
+        android:pathData="M9 16.2L4.8 12l-1.4 1.4L9 19 21 7l-1.4-1.4L9 16.2z" />
+</vector>
--- a/res/layout/setup_cyanogen_services.xml
+++ b/res/layout/setup_cyanogen_services.xml
@@ -50,6 +50,58 @@
                    android:text="@string/services_explanation"
                    android:clickable="true"/>

+                <LinearLayout
+                    android:id="@+id/killswitch"
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/location_margin_left"
+                    android:paddingRight="@dimen/content_margin_right"
+                    android:background="?android:attr/selectableItemBackground">
+
+
+                    <ImageView
+                        android:id="@+id/killswitch_check"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="5dp"
+                        android:paddingLeft="8dp"
+                        android:paddingRight="@dimen/location_text_margin_left"
+                        android:layout_gravity="center|top"
+                        android:src="@drawable/tick"/>
+
+                    <RelativeLayout
+                        android:layout_width="0px"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="top"
+                        android:layout_marginLeft="@dimen/location_text_margin_left"
+                        android:layout_marginRight="@dimen/location_text_margin_right"
+                        android:paddingBottom="@dimen/content_margin_bottom">
+
+                        <TextView
+                            android:id="@+id/killswitch_title"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textSize="15sp"
+                            android:lineSpacingExtra="@dimen/setup_line_spacing"
+                            android:fadingEdge="horizontal"
+                            android:text="@string/setup_require_cyanogen_label"/>
+
+                        <TextView
+                            android:id="@+id/killswitch_summary"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_below="@+id/killswitch_title"
+                            android:layout_alignStart="@+id/killswitch_title"
+                            android:textSize="15sp"
+                            android:lineSpacingExtra="@dimen/setup_line_spacing"
+                            android:textColor="?android:attr/textColorSecondary"
+                            android:text="@string/setup_device_locked_instructions"/>
+                    </RelativeLayout>
+
+                </LinearLayout>
+
                <!-- Whether or not to enable metrics -->
                <LinearLayout
                    android:id="@+id/metrics"
--- a/res/layout/setup_fingerprint.xml
+++ b/res/layout/setup_fingerprint.xml
@@ -0,0 +1,90 @@
+<?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/fingerprint_setup_summary" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="24dp"
+                    android:paddingLeft="@dimen/content_margin_left"
+                    android:paddingRight="@dimen/location_text_margin_right"
+                    android:drawableStart="@drawable/ic_check_mark"
+                    android:drawablePadding="24dp"
+                    android:gravity="center_vertical"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    android:text="@string/fingerprint_setup_backup_lock_method"/>
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="24dp"
+                    android:paddingLeft="@dimen/content_margin_left"
+                    android:paddingRight="@dimen/location_text_margin_right"
+                    android:drawableStart="@drawable/ic_check_mark"
+                    android:drawablePadding="24dp"
+                    android:gravity="center_vertical"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    android:text="@string/fingerprint_setup_add_fingerprint"/>
+
+                <TextView
+                    android:id="@+id/setup_fingerprint"
+                    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/fingerprint_setup_text_color"
+                    android:text="@string/fingerprint_setup_screen_lock_setup"/>
+
+            </LinearLayout>
+        </ScrollView>
+    </FrameLayout>
+</LinearLayout>
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -65,4 +65,9 @@
  <string name="services_os_nav_keys_label"><b>Gebruik skerm navigasie sleutels</b> in plaas van hardeware sleutels.</string>
  <string name="services_use_secure_sms">Maak gebruik van veilige SMS</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g> om SMS gesprekke met ander gebruikers te enkripteer met behulp van veilige SMS op \'n  <xliff:g id="name" example="CyanogenMod">%s</xliff:g> toestel.</string>
+  <string name="setup_unlock">Ontsluit</string>
+  <string name="setup_device_locked">Die toestel is gesluit deur die gebruiker.</string>
+  <string name="setup_require_cyanogen_label"><b>Benodig  jou Cyanogen wagwoord</b> om jou toestel te gebruik, selfs nadat \'n fabriek herstel gedoen is.</string>
+  <string name="setup_device_locked_instructions"><i>Om hierdie funksie te aan/af te skakel, gaan asseblief na Instellings &gt; Sekuriteit</i></string>
+  <string name="setup_warning_skip_anyway">Sonder \'n Cyanogen bedryfstelsel rekening, sal jy nie in staat wees om:\n\nOm jou toestel met nuwe ikone, agtergronde en meer in die Temas program te verpersoonlik nie\n\nJou toestel te vind of op te spoor indien dit verlore gaan nie</string>
 </resources>
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-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.
-->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">معالج التثبيت</string>
-  <string name="next">القادم</string>
-  <string name="skip">تخطي</string>
-  <string name="start">البداية</string>
-  <string name="ok">موافق</string>
-  <string name="loading">ثانية واحدة</string>
-  <string name="setup_complete">اكتمل الإعداد</string>
-  <string name="setup_welcome">مرحباً</string>
-  <string name="setup_wifi">تحديد الواي فاي</string>
-  <string name="setup_sim_missing">شريحة SIM مفقودة</string>
-  <string name="setup_choose_data_sim">اختر شريحة SIM للبيانات</string>
-  <string name="setup_location">خدمات الموقع</string>
-  <string name="setup_other">خدمات أخرى</string>
-  <string name="setup_datetime">التاريخ والوقت</string>
-  <string name="setup_current_date">التاريخ الحالي</string>
-  <string name="setup_current_time">الوقت الحالي</string>
-  <string name="sim_missing_summary" product="tablet">لم يتم العثور على شريحة SIM في الكمبيوتر اللوحي الخاص بك. لإدخال شريحة SIM، عليك قراءة الإرشادات المرفقة بجهازك.</string>
-  <string name="sim_missing_summary" product="default">لم يتم العثور على شريحة SIM في هاتفك. لإدخال شريحة SIM، عليك قراءة الإرشادات المرفقة بجهازك.</string>
-  <string name="choose_data_sim_summary" product="tablet">أي شريحة SIM تريد استخدامها للبيانات؟ شريحة SIM المحددة قد يترتب عليها رسوماً للشبكة لأنها ستُستخدم لإعداد الكمبيوتر اللوحي الخاص بك.</string>
-  <string name="choose_data_sim_summary" product="default">أي شريحة SIM تريد استخدامها للبيانات؟ شريحة SIM المحددة قد يترتب عليها رسوماً للشبكة لأنها ستُستخدم لإعداد هاتفك.</string>
-  <string name="date_time_summary">تعيين المنطقة الزمنية الخاصة بك وضبط الوقت والتاريخ الحالي إذا لزم الأمر</string>
-  <string name="backup_data_summary"><b>إجراء نسخ احتياطي</b> لبيانات التطبيقات وكلمات مرور شبكات الواي فاي والإعدادات الأخرى على خوادم جوجل</string>
-  <string name="other_services_summary">هذه الخدمات  تجعل جوجل في خدمتك، ويمكنك تشغيلها أو إيقاف تشغيلها في أي وقت. ستُستخدم البيانات بحسب <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-  <string name="location_services_summary">تسمح خدمات الموقع لتطبيقات النظام والتطبيقات الخارجية بجمع واستخدام البيانات مثل موقعك التقريبي. على سبيل المثال، قد يستخدم تطبيق ما موقعك التقريبي لتحديد موقع  المقاهي القريبة.</string>
-  <string name="location_access_summary"><b>يسمح للتطبيقات التي طلبت إذنك</b> باستخدام معلومات موقعك. وقد يشمل ذلك موقعك الحالي ومواقعك السابقة.</string>
-  <string name="location_gps" product="tablet"><b>تحسين دقة الموقع</b> بالسماح للتطبيقات باستخدام نظام تحديد المواقع على الكمبيوتر اللوحي الخاص بك.</string>
-  <string name="location_gps" product="default"><b>تحسين دقة الموقع</b> بالسماح للتطبيقات باستخدام نظام تحديد المواقع على هاتفك.</string>
-  <string name="location_network"><b>استخدام الواي فاي</b> لمساعدة التطبيقات على تحديد موقعك.</string>
-  <string name="location_network_telephony"><b>استخدام الواي فاي وشبكات الجوال</b> لمساعدة التطبيقات على تحديد موقعك.</string>
-  <string name="location_network_gms"><b>استخدام خدمة الموقع من جوجل</b> لمساعدة التطبيقات على تحديد موقعك. وهذا يعني إرسال بيانات مجهولة عن الموقع إلى جوجل، حتى في حالة عدم تشغيل أي تطبيقات.</string>
-  <string name="setup_mobile_data">تشغيل بيانات الجوال</string>
-  <string name="setup_mobile_data_no_service">لا توجد خدمة</string>
-  <string name="setup_mobile_data_emergency_only">مكالمات الطوارئ فقط</string>
-  <string name="enable_mobile_data_summary">هل تريد تشغيل بيانات الجوال أثناء عملية الإعداد؟ تشغيل بيانات الجوال قد تترتب عليه رسوم البيانات.</string>
-  <string name="no">لا</string>
-  <string name="yes">نعم</string>
-  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g> شريحة</string>
-  <string name="emergency_call">مكالمة طوارئ</string>
-  <string name="setup_services">ميزات Cyanogen</string>
-  <string name="services_explanation" product="tablet">تعمل هذه الخدمات  على توسيع نطاق إمكانيات الكمبيوتر اللوحي الخاص بك. ستُستخدم البيانات بحسب <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-  <string name="services_explanation" product="default">تعمل هذه الخدمات  على توسيع نطاق إمكانيات هاتفك. ستُستخدم البيانات بحسب <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-  <string name="services_privacy_policy">سياسة الخصوصية</string>
-  <string name="services_help_improve_cm">ساهم في تحسين <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
-  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%s </xliff:g> بإرسال بيانات تشخيص المشكلات وبيانات الاستخدام تلقائياً إلى Cyanogen. هذه المعلومات لا يمكن استخدامها للتعرف عليك، لكنها تقدم المساعدة للفرق العاملة على جوانب مثل عمر البطارية وأداء التطبيقات، وميزات  <xliff:g id="name" example="CyanogenMod"> %s </xliff:g> الجديدة.</string>
-  <string name="services_apply_theme">تطبيق السمة <xliff:g id="name" example="Material">%s </xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s </xliff:g> تمكين الرموز الفريدة والخلفيات والخطوط.</string>
-  <string name="services_os_nav_keys_label"><b>استخدام مفاتيح التنقل على الشاشة</b> بدلاً من مفاتيح الأجهزة.</string>
-  <string name="services_use_secure_sms">استخدام شريحة SIM آمنة</string>
-  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s </xliff:g> لتشفير المحادثات عبر الرسائل القصيرة مع المستخدمين الآخرين باستخدام شريحة SMS آمنة على جهاز <xliff:g id="name" example="CyanogenMod"> %s </xliff:g>.</string>
-</resources>
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -27,5 +27,4 @@
  <string name="setup_mobile_data_no_service">Xidmət yoxdur</string>
  <string name="enable_mobile_data_summary">Quraşdırma vaxtı mobil verilənlərdən istifadə etmək istəyirsiniz? Mobil verilənləri açmaq əlavə ödənişə səbəb ola bilər.</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
-  <string name="services_os_nav_keys_label"><b>Avadanlıq düymələri əvəzinə ekran üstü hərəkət düymələrindən istifadə edin.</b></string>
 </resources>
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -65,4 +65,9 @@
  <string name="services_os_nav_keys_label"><b>Utilitza les tecles de navegació en pantalla</b> enlloc de les tecles físiques.</string>
  <string name="services_use_secure_sms">Utilitza SMS segurs</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g> per xifrarr les converses SMS amb altres usuaris mitjançant SMS segurs en un dispositiu <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
+  <string name="setup_unlock">Desbloqueja</string>
+  <string name="setup_device_locked">Aquest dispositiu ha estat bloquejat per l\'usuari.</string>
+  <string name="setup_require_cyanogen_label"><b>Demana la contrasenya del teu compte Cyanogen OS</b> per utilitzar el teu dispositiu, fins i tot després de restaurar als ajustaments de fàbrica.</string>
+  <string name="setup_device_locked_instructions"><i>Per activar/desactivar aquesta característica, si us plau ves a Configuració &gt; Seguretat</i></string>
+  <string name="setup_warning_skip_anyway">Sense un compte Cyanogen OS, no podràs:\n\nPersonalitzar el teu telèfon amb noves icones, fons de pantalla i més en l\'aplicació de Temes\n\nLocalitzar o esborrar remotament el teu telèfon si el perds</string>
 </resources>
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -65,4 +65,9 @@
  <string name="services_os_nav_keys_label"><b>Použít navigační klávesy na obrazovce</b> namísto hw kláves.</string>
  <string name="services_use_secure_sms">Použít zabezpečené SMS</string>
  <string name="services_secure_sms_label">Použijte aplikaci <xliff:g id="name" example="Use secure SMS">%s</xliff:g> pro šifrované SMS a zabezpečenou komunikaci na zařízení <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
+  <string name="setup_unlock">Odemknout</string>
+  <string name="setup_device_locked">Toto zařízení bylo uzamčeno uživatelem.</string>
+  <string name="setup_require_cyanogen_label">Po obnovení továrního nastavení bude <b>vyžadováno heslo k Vašemu účtu Cyanogen OS</b>.</string>
+  <string name="setup_device_locked_instructions"><i>Pro zapnutí/vypnutí této funkce, přejděte do nastavení &gt; Zabezpečení</i></string>
+  <string name="setup_warning_skip_anyway">Bez účtu Cyanogen nebudete schopni:\n\nPřizpůsobit svůj telefon novými ikonami, tapetami a dalším z aplikace Motivy\n\nVzdáleně vyhledat nebo vymazat telefon v případě ztráty</string>
 </resources>
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -65,4 +65,9 @@
  <string name="services_os_nav_keys_label"><b>Brug navigationstaster på skærmen</b> i stedet for fysiske knapper.</string>
  <string name="services_use_secure_sms">Brug sikker SMS</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g> til at kryptere SMS-samtaler med andre brugere ved hjælp af sikker SMS på en <xliff:g id="name" example="CyanogenMod">%s</xliff:g> enhed.</string>
+  <string name="setup_unlock">Lås op</string>
+  <string name="setup_device_locked">Denne enhed er blevet låst af brugeren.</string>
+  <string name="setup_require_cyanogen_label"><b>Kræver adgangskoden til din Cyanogen konto</b> for at bruge enheden, selv efter en nulstilling til fabriksindstillinger.</string>
+  <string name="setup_device_locked_instructions"><i>For at slå denne funktion til/fra, skal du gå til Indstillinger &gt; Sikkerhed</i></string>
+  <string name="setup_warning_skip_anyway">Uden en Cyanogen konto kan du ikke:\n\nTilpasse din telefon med nye ikoner, tapeter og meget mere i Tema app\'en\n\nFinde eller slette din telefon, hvis du mister den</string>
 </resources>
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -65,4 +65,9 @@
  <string name="services_os_nav_keys_label"><b>Bildschirm-Navigationstasten</b> statt Hardwaretasten verwenden.</string>
  <string name="services_use_secure_sms">Sichere SMS verwenden</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g>, um SMS-Konversationen mit anderen Nutzern auf einem <xliff:g id="name" example="CyanogenMod">%s</xliff:g>-Gerät zu verschlüsseln.</string>
+  <string name="setup_unlock">Entsperren</string>
+  <string name="setup_device_locked">Dieses Gerät wurde durch den Benutzer gesperrt.</string>
+  <string name="setup_require_cyanogen_label"><b>Ihr Cyanogen OS-Konto-Passwort</b> wird auch nach einem Zurücksetzen auf Werkseinstellungen benötigt.</string>
+  <string name="setup_device_locked_instructions"><i>Um diese Funktion zu aktivieren/deaktivieren, gehen Sie zu Einstellungen &gt; Sicherheit</i></string>
+  <string name="setup_warning_skip_anyway">Ohne ein Cyanogen OS-Konto können Sie ihr Telefon nicht:\n\nMit neuen Symbolen, Hintergründen und mehr in der Design-App anpassen\n\nLokalisieren oder löschen, falls Sie es verloren haben</string>
 </resources>
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -65,4 +65,9 @@
  <string name="services_os_nav_keys_label"><b>Κάντε χρήση των πλήκτρων πλοήγησης της οθόνης</b> αντί των φυσικών πλήκτρων.</string>
  <string name="services_use_secure_sms">Κάντε χρήση των ασφαλών SMS</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g> για να κρυπτογραφήσετε τις συνομιλίες SMS με άλλους χρήστες που χρησιμοποιούν ασφαλή SMS σε συσκευές <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
+  <string name="setup_unlock">Ξεκλείδωμα</string>
+  <string name="setup_device_locked">Αυτή η συσκευή έχει κλειδωθεί από το χρήστη.</string>
+  <string name="setup_require_cyanogen_label"><b>Απαίτηση του κωδικού πρόσβασης του λογαριασμού σας Cyanogen OS</b> για να χρησιμοποιήσετε τη συσκευή σας, ακόμα και μετά από επαναφορά εργοστασιακών ρυθμίσεων.</string>
+  <string name="setup_device_locked_instructions"><i>Για να ενεργοποιήσετε/απενεργοποιήσετε αυτή τη λειτουργία, παρακαλώ πηγαίνετε στις Ρυθμίσεις &gt; Ασφάλεια</i></string>
+  <string name="setup_warning_skip_anyway">Χωρίς ένα λογαριασμό Cyanogen OS, δεν θα είστε σε θέση να:\n\nΠροσαρμόσετε το τηλέφωνό σας με νέα εικονίδια, ταπετσαρίες και πολλά άλλα στην εφαρμογή Θεμάτων\n\nΕντοπίσετε ή διαγράψετε εξ αποστάσεως το τηλέφωνό σας εάν το χάσετε</string>
 </resources>
--- a/res/values-eo/strings.xml
+++ b/res/values-eo/strings.xml
@@ -16,53 +16,10 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Asistanto pri agordoj</string>
  <string name="next">Sekvonta</string>
-  <string name="skip">Preterpasi</string>
  <string name="start">Lanĉi</string>
  <string name="ok">Konfirmi</string>
-  <string name="loading">Nur unu sek.\u2026</string>
-  <string name="setup_complete">Agordo finiĝis</string>
  <string name="setup_welcome">Bonvenon</string>
-  <string name="setup_wifi">Elektu vifion</string>
-  <string name="setup_sim_missing">SIM-karto mankas</string>
-  <string name="setup_choose_data_sim">Elektu SIM-karto por datumoj</string>
-  <string name="setup_location">Servo de lokigo</string>
-  <string name="setup_other">Aliaj servoj</string>
-  <string name="setup_datetime">Dato &amp; tempo</string>
-  <string name="setup_current_date">Aktuala dato</string>
-  <string name="setup_current_time">Aktuala tempo</string>
-  <string name="sim_missing_summary" product="tablet">SIM-karto ne troveblas en via tabulo. Por enmeti SIM karton, legu la informojn de via aparato.</string>
-  <string name="sim_missing_summary" product="default">SIM-karto ne troveblas en via telefono. Por enmeti SIM-karton, legu la informojn de via aparato.</string>
-  <string name="choose_data_sim_summary" product="tablet">Kiun SIM-karton vi deziras uzi por datumoj ? La elektita SIM-karto eble postulos kostojn ĉar agordoj uzos ĝin.</string>
-  <string name="choose_data_sim_summary" product="default">Kiun SIM-karton vi deziras uzi por datumoj ? La elektita SIM-karto eble postulos kostojn ĉar agordoj uzos ĝin.</string>
-  <string name="date_time_summary">Agordu vian horzonon kaj ĝustigu la aktualan daton kaj tempon laŭbezone</string>
-  <string name="backup_data_summary"><b>Savkopio</b> de aplikaĵaj datumoj, vifiaj pasvortoj kaj aliaj agordoj ĉe Google serviloj</string>
-  <string name="other_services_summary">Tiujn servoj disponigas Google al vi, kaj vi povas ŝalti aŭ malŝalti ilin iam ajn. Datumoj estos uzataj laŭ <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Google.</string>
-  <string name="location_services_summary">Lokiga servo permesas al sistemaj aplikaĵoj  kaj aliaj aplikaĵoj koni vian aproksiman lokigon. Ekzemple, aplikaĵo povas uzi vian aproksiman lokigon por trovi kafejojn en la ĉirkaŭaĵo.</string>
-  <string name="location_access_summary"><b>Permesi al aplikaĵoj kiujn vi aprobis</b> koni vian lokigon. Tiu inkluzivas aktualan lokigon kaj pasintajn.</string>
-  <string name="location_gps" product="tablet"><b>Plibonigi vian lokigon</b> permesante aplikaĵojn uzi la GPS de via tabuleto.</string>
-  <string name="location_gps" product="default"><b>Plibonigi vian lokigon</b> permesante aplikaĵojn uzi la GPS de via telefono.</string>
-  <string name="location_network"><b>Uzi Vifion</b> por helpi aplikaĵojn koni vian lokigon.</string>
-  <string name="location_network_telephony"><b>Uzi Vifion kaj porteblajn retojn</b> por helpi aplikaĵojn koni vian lokigon.</string>
-  <string name="location_network_gms"><b>Uzi lokigan servon de Google</b> por helpi aplikaĵojn koni vian lokigon. Tio signifas sendi anonimajn lokigajn datumojn al Google, eĉ kiam neniu aplikaĵo funkcias.</string>
-  <string name="setup_mobile_data">Ŝalti poŝkomputilan reton</string>
-  <string name="setup_mobile_data_no_service">Neniu servo</string>
-  <string name="setup_mobile_data_emergency_only">Nur urĝaj alvokoj</string>
-  <string name="enable_mobile_data_summary">Ĉu vi deziras uzi retajn datumojn dum agordo ?  Ŝalti retan aliron povas okazi pliajn kostojn.</string>
  <string name="no">Ne</string>
  <string name="yes">Jes</string>
-  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
-  <string name="emergency_call">Urĝa alvoko</string>
-  <string name="setup_services">Cyanogen funkcioj</string>
-  <string name="services_explanation" product="tablet">Tiuj servoj funkcias por etendi kapablojn de via tabulo. Datumoj estos uzataj laŭ la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Cyanogen.</string>
-  <string name="services_explanation" product="default">Tiuj servoj funkcias por etendi kapablojn de via telefono. Datumoj estos uzataj laŭ la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Cyanogen.</string>
-  <string name="services_privacy_policy">Privateca politiko</string>
-  <string name="services_help_improve_cm">Helpu por plibonigi <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
-  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g> per aŭtomata sendado de diagnozaj kaj uzaj datumoj al Cyanogen. Tiuj informoj ne kapablos identigi vin kaj helpos programistojn kiuj laboras pri bateria vivdaŭro, aplikaĵa rendimento kaj novaj <xliff:g id="name" example="CyanogenMod">%s</xliff:g> funkcioj.</string>
-  <string name="services_apply_theme">Apliki la etoson <xliff:g id="name" example="Material">%s</xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> ŝaltas unikajn piktogramojn, ekranfonojn kaj fontojn.</string>
-  <string name="services_os_nav_keys_label"><b>Uzi ekran-klavojn </b> anstataŭ tiujn de la aparato.</string>
-  <string name="services_use_secure_sms">Uzi sekurajn SMS</string>
-  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g> por ĉifri SMS dialogojn kun aliaj uzantoj per sekuraj SMS sur <xliff:g id="name" example="CyanogenMod">%s</xliff:g> aparatoj.</string>
 </resources>
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -65,4 +65,9 @@
  <string name="services_os_nav_keys_label"><b>Usar las teclas de navegación en pantalla</b> en vez de las teclas físicas.</string>
  <string name="services_use_secure_sms">Usar SMS seguros</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Usar SMS seguro">%s</xliff:g> para cifrar conversaciones SMS con otros usuarios usando SMS seguros en tu dispositivo <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
+  <string name="setup_unlock">Desbloquear</string>
+  <string name="setup_device_locked">Este dispositivo ha sido bloqueado por el usuario.</string>
+  <string name="setup_require_cyanogen_label"><b>Se requiere la contraseña de tu cuenta Cyanogen OS</b> para poder utilizar el dispositivo incluso después de un restablecimiento de fábrica.</string>
+  <string name="setup_device_locked_instructions"><i>Para activar o desactivar esta función, ve a Ajustes &gt; Seguridad</i></string>
+  <string name="setup_warning_skip_anyway">Sin una cuenta de Cyanogen OS no podrás:\n\nPersonalizar tu teléfono con nuevos iconos, fondos de pantalla y mucho más a través de la aplicación de temas\n\nBorrar tu teléfono localmente o de manera remota si se ha perdido</string>
 </resources>
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -26,7 +26,7 @@
  <string name="setup_welcome">Ongi etorri</string>
  <string name="setup_wifi">Hautatu Wi-Fia</string>
  <string name="setup_sim_missing">SIM txartela falta da</string>
-  <string name="setup_choose_data_sim">Hautatu datuetarako SIM txartela</string>
+  <string name="setup_choose_data_sim">Aukeratu datuetarako SIM txartela</string>
  <string name="setup_location">Kokaleku zerbitzuak</string>
  <string name="setup_other">Bestelako zerbitzuak</string>
  <string name="setup_datetime">Data eta ordua</string>
@@ -36,13 +36,13 @@
  <string name="sim_missing_summary" product="default">Ez da SIM txartelik antzeman zure telefonoan. SIM txartel bat sartzeko jarraitu zure gailuarekin zetozen argibideak.</string>
  <string name="choose_data_sim_summary" product="tablet">Zein SIM erabili nahi duzu datu mugikorretarako? Hautatutako SIM txartelean gastuak sor litzake zure tableta ezartzeko erabiliko baita.</string>
  <string name="choose_data_sim_summary" product="default">Zein SIM erabili nahi duzu datu mugikorretarako? Hautatutako SIM txartelean gastuak sor litzake zure telefonoa ezartzeko erabiliko baita.</string>
-  <string name="date_time_summary">Ezarri zure ordu-zona eta doitu oraingo data beharrezkoa bada</string>
+  <string name="date_time_summary">Ezarri zure ordu zonaldea eta doitu oraingo data beharrezkoa bada</string>
  <string name="backup_data_summary">Aplikazio datuen, Wi-Fi pasahitzen, eta bestelako ezarpenen <b>babeskopia</b> egin Google zerbitzarietan</string>
  <string name="other_services_summary">Zerbitzu hauek Google zure mesedetan lanean jartzen dute, edozein unetan piztu edo itzali ditzakezu. Datuak Google <xliff:g id="name" example="Privacy Policy">%s</xliff:g> arabera erabiliko dira.</string>
  <string name="location_services_summary">Kokaleku zerbitzuek zure kokalekua bezalako datuak eskuratzea ahalbidetzen diete sistemako eta instalatutako aplikazioei. Adibidez, aplikazio batek zure kokalekua erabili lezake inguruko kafetegiak aurkitzeko.</string>
  <string name="location_access_summary"><b>Baimena eskatu dizuten aplikazioei</b> zure kokaleku informazioa erabiltzea ahalbidetu. Uneko zein iraganeko kokalekuak barne.</string>
-  <string name="location_gps" product="tablet"><b>Hobetu kokalekuaren zehaztasuna</b> aplikazioei tabletaren GPSa erabiltzea baimenduz.</string>
-  <string name="location_gps" product="default"><b>Hobetu kokalekuaren zehaztasuna</b> aplikazioei telefonoaren GPSa erabiltzea baimenduz.</string>
+  <string name="location_gps" product="tablet"><b>hobetu kokalekuaren zehaztasuna</b> aplikazioei tabletako GPS-a erabiltzea baimenduz.</string>
+  <string name="location_gps" product="default"><b>hobetu kokalekuaren zehaztasuna</b> aplikazioei telefonoaren GPS-a erabiltzea baimenduz.</string>
  <string name="location_network"><b>Erabili Wi-Fia</b> aplikazioei zure kokalekua zehazten laguntzeko.</string>
  <string name="location_network_telephony"><b>Erabili Wi-Fi eta sare mugikorrak</b> aplikazioei zure kokalekua zehazten laguntzeko.</string>
  <string name="location_network_gms"><b>Erabili Google kokaleku zerbitzua</b> aplikazioei zure kokalekua zehazten laguntzeko. Honek Google-i kokaleku informazio anonimoa bidaltzea dakar, aplikaziorik erabiltzen ez duzunean ere.</string>
@@ -65,4 +65,9 @@
  <string name="services_os_nav_keys_label"><b>Erabili pantailako nabigazio teklak</b> hardware teklen ordez.</string>
  <string name="services_use_secure_sms">Erabili SMS segurua</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g> <xliff:g id="name" example="CyanogenMod">%s</xliff:g> gailu batean SMS segurua erabiltzen duten beste erabiltzaileekin dituzun SMS elkarrizketak zifratzeko.</string>
+  <string name="setup_unlock">Desblokeatu</string>
+  <string name="setup_device_locked">Erabiltzaileak gailu hau blokeatu du.</string>
+  <string name="setup_require_cyanogen_label"><b>Eskatu zure Cyanogen OS kontuaren pasahitza</b> gailua erabiltzeko lantegiko jatorrizko ezarpenetara berrezarri eta gero.</string>
+  <string name="setup_device_locked_instructions"><i>Ezaugarri hau gaitu edo ezgaitzeko zoaz hona: Ezarpenak &gt; Segurtasuna</i></string>
+  <string name="setup_warning_skip_anyway">Cyanogen OS kontu bat gabe, ezin izango duzu:\n\nZure telefonoa ikono horma-irudi eta gai berriekin pertsonalizatu Gai aplikazioan\n\n.Telefonoa aurkitu eta ezabatu galtzen baduzu</string>
 </resources>
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -26,7 +26,7 @@
  <string name="setup_welcome">خوش آمدید</string>
  <string name="setup_wifi">انتخاب وای‌فای</string>
  <string name="setup_sim_missing">سیم کارت موجود نیست</string>
-  <string name="setup_choose_data_sim">انتخاب سیم کارت برای داده همراه</string>
+  <string name="setup_choose_data_sim">سیم‌کارتی را برای داده انتخاب کنید</string>
  <string name="setup_location">خدمات مکان</string>
  <string name="setup_other">سایر خدمات</string>
  <string name="setup_datetime">تاریخ &amp; زمان</string>
@@ -34,35 +34,25 @@
  <string name="setup_current_time">زمان کنونی</string>
  <string name="sim_missing_summary" product="tablet">سیم کارتی در تبلت شما یافت نشد. برای قرار دادن یک سیم کارت، دستورالعمل همراه دستگاه خود را بخوانید.</string>
  <string name="sim_missing_summary" product="default">سیم کارتی در گوشی شما یافت نشد. برای قرار دادن یک سیم کارت، دستورالعمل همراه دستگاه خود را بخوانید.</string>
-  <string name="choose_data_sim_summary" product="tablet">از کدام سیم کارت برای داده همراه می خواهید استفاده کنید؟ انتخاب سیم کارت ممکن است هزینه های شبکه ایجاد کند چرا که برای راه‌اندازی تبلت شما استفاده می شود.</string>
-  <string name="choose_data_sim_summary" product="default">از کدام سیم کارت برای داده همراه می خواهید استفاده کنید؟ انتخاب سیم کارت ممکن است هزینه های شبکه ایجاد کند چرا که برای راه‌اندازی گوشی شما استفاده می شود.</string>
-  <string name="date_time_summary">در صورت نیاز منطقه‌ی زمانی خود و تاریخ و زمان فعلی را تنظیم کنید</string>
+  <string name="choose_data_sim_summary" product="tablet">از کدام سیم‌کارت برای داده همراه می‌خواهید استفاده کنید؟ سیم‌کارت انتخابی ممکن است هزینه‌های شبکه ایجاد کند چرا که برای راه‌اندازی تبلت شما استفاده می‌شود.</string>
+  <string name="choose_data_sim_summary" product="default">از کدام سیم‌کارت برای داده همراه می خواهید استفاده کنید؟ سیم‌کارت انتخابی ممکن است هزینه‌های شبکه ایجاد کند چرا که برای راه‌اندازی گوشی شما استفاده می‌شود.</string>
+  <string name="date_time_summary">منطقه ی زمانی و تاریخ فعلی را در صورت نیاز تنظیم کنید</string>
  <string name="backup_data_summary">از داده‌های برنامه‌ها، گذرواژه وای‌فای و دیگر تنظیمات در سرورهای گوگل پشتیبان بگیر</string>
-  <string name="other_services_summary">این خدمات، گوگل را برای شما تنظیم می‌کنند و شما می‌توانید هر زمان آن‌ها را روشن یا خاموش کنید. از داده‌ها بر طبق <xliff:g id="name" example="Privacy Policy">%s</xliff:g> گوگل استفاده خواهد شد.</string>
-  <string name="location_services_summary">سرویس‌های مکان به نقشه‌ها و برنامه‌های دیگر برای جمع‌آوری و استفاده از داده مانند محل تقریبی اجازه می‌دهند. به عنوان مثال، نقشه‌ها ممکن است مکان تقریبی شما را برای یافتن کافی‌شاپ‌های نزدیکتان استفاده کنند.</string>
-  <string name="location_access_summary"><b>به برنامه‌ها اجازه می‌دهد بدون اجازه شما</b> از اطلاعات موقعیت شما استفاده کنند. ممکن است این استفاده شامل موقعیت فعلی و قبلی شما شود.</string>
-  <string name="location_gps" product="tablet">با اجازه دادن به برنامه‌ها برای استفاده از GPS تبلت، <b>دقت موقعیت خود را بهبود بخشید</b>.</string>
-  <string name="location_gps" product="default">با اجازه دادن به برنامه‌ها برای استفاده از جی‌پی‌اس گوشی، <b>دقت موقعیت خود را بهبود بخشید</b>.</string>
+  <string name="other_services_summary">این خدمات گوگل را برای شما تنظیم می‌کنند، و شما می‌توانید هر زمان آن‌ها را روشن یا خاموش کنید. داده مطابق با <xliff:g id="name" example="Privacy Policy">%s</xliff:g> گوگل استفاده خواهد شد.</string>
+  <string name="location_services_summary">سرویس‌های مکان به نقشه‌ها و برنامه‌های دیگر برای جمع‌آوری و استفاده از داده مانند محل تقریبی شما اجازه می‌دهند. به عنوان مثال، برنامه‌ای ممکن است از مکان تقریبی شما برای یافتن کافی‌شاپ‌های نزدیکتان استفاده کند.</string>
+  <string name="location_gps" product="tablet"><b>دقت مکان</b> را با اجازه دادن به برنامه‌ها به استفاده از جی‌پی‌اس در تبلتتان، بهبود بخشید.</string>
+  <string name="location_gps" product="default"><b>دقت مکان</b> را با اجازه دادن به برنامه‌ها به استفاده از جی‌پی‌اس در تلفنتان، بهبود بخشید.</string>
  <string name="location_network">برای کمک به برنامه‌ها در تعیین مکانتان از وای‌فای استفاده کنید.</string>
  <string name="location_network_telephony">برای کمک به برنامه‌ها در تعیین مکانتان از وای‌فای وشبکه‌های همراه استفاده کنید.</string>
-  <string name="location_network_gms"><b>از سرویس‌های مکان گوگل استفاده کنید</b> تا به برنامه‌ها کمک شود که موقعیت شما را تعیین کنند. این به معنای ارسال داده‌های ناشناس موقعیت به گوگل است، حتی هنگامی که برنامه‌ای در حال اجرا نیست.</string>
  <string name="setup_mobile_data">روشن کردن داده همراه</string>
  <string name="setup_mobile_data_no_service">بدون سرویس</string>
  <string name="setup_mobile_data_emergency_only">فقط تماس‌های اضطراری</string>
-  <string name="enable_mobile_data_summary">آیا می‌خواهید در طول راه‌اندازی از داده همراه استفاده کنید؟ ممکن است روشن کردن داده همراه مشمول هزینه شود.</string>
  <string name="no">خیر</string>
  <string name="yes">بله</string>
-  <string name="data_sim_name">سیم کارت <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
  <string name="emergency_call">تماس اضطراری</string>
  <string name="setup_services">ویژگی‌های سایانوژن</string>
-  <string name="services_explanation" product="tablet">این خدمات برای افزایش قابلیت‌های تبلت شما هستند. داده‌ها مطابق با <xliff:g id="name" example="Privacy Policy">%s</xliff:g> سایانوژن استفاده خواهند شد.</string>
-  <string name="services_explanation" product="default">این خدمات برای افزایش قابلیت‌های گوشی شما هستند. داده‌ها مطابق با <xliff:g id="name" example="Privacy Policy">%s</xliff:g> سایانوژن استفاده خواهند شد.</string>
  <string name="services_privacy_policy">سیاست حفظ حریم خصوصی</string>
-  <string name="services_help_improve_cm">به بهبود <xliff:g id="name" example="CyanogenMod">%s</xliff:g> کمک کنید</string>
-  <string name="services_metrics_label">به وسیله ارسال خودکار داده‌های تشخیصی و استفاده به سایانوژن، <xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g>. از این داده‌ها برای شناسایی شما استفاده نمی‌شود و تنها برای کمک به گروه‌هایی که روی مواردی مانند عمر باتری، عملکرد برنامه و قابلیت‌های جدید <xliff:g id="name" example="CyanogenMod">%s</xliff:g> features کار می‌کنند استفاده می‌شود.</string>
-  <string name="services_apply_theme">اعمال مضمون <xliff:g id="name" example="Material">%s</xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> که آیکون‌ها، کاغذدیواری‌ها و فونت‌هایی بی‌نظیر را فعال می‌کند.</string>
-  <string name="services_os_nav_keys_label"><b>استفاده از کلیدهای پیمایش صفحه نمایش</b> به جای کلیدهای سخت‌افزاری.</string>
  <string name="services_use_secure_sms">استفاده از پیامک امن</string>
-  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g> برای رمزگذاری گفتگوهای پیامکی با کاربران دیگر با استفاده ازپیامک امن در یک دستگاه <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
+  <string name="setup_unlock">بازگشایی</string>
+  <string name="setup_device_locked">این دستگاه توسط کاربر قفل شده است.</string>
 </resources>
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -65,4 +65,9 @@
  <string name="services_os_nav_keys_label"><b>Käytä näytön navigointipalkkia</b> fyysisten näppäinten sijaan.</string>
  <string name="services_use_secure_sms">Käytä turvallisia tekstiviestejä</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g> salataksesi tekstiviestikeskustelut muiden turvallisia tekstiviestejä ja <xliff:g id="name" example="CyanogenMod">%s</xliff:g>ia käyttävien henkilöiden kanssa.</string>
+  <string name="setup_unlock">Avaa lukitus</string>
+  <string name="setup_device_locked">Käyttäjä on lukinnut laitteen.</string>
+  <string name="setup_require_cyanogen_label"><b>Vaadi Cyanogen OS-tilin salasana</b> käyttääksesi laitetta myös tehdasasetusten palautuksen jälkeen.</string>
+  <string name="setup_device_locked_instructions"><i>Poistaaksesi tämän ominaisuuden käytöstä/ottaaksesi käyttöön, mene Asetukset &gt; Suojaus</i></string>
+  <string name="setup_warning_skip_anyway">Ilman Cyanogen OS-tiliä, et voi:\n\nMukauttaa puhelintasi uusilla kuvakkeilla, taustakuvilla tai muilla käyttämällä Teemat-sovellusta\n\nPaikantaa tai etätyhjentää kadonnutta puhelintasi</string>
 </resources>
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -65,4 +65,9 @@
  <string name="services_os_nav_keys_label"><b>Utilisation des touches de navigation de l\'écran</b> au lieu des touches physiques.</string>
  <string name="services_use_secure_sms">Utiliser les SMS sécurisés</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g> pour crypter les conversations SMS avec les autres utilisateurs utilisant les SMS sécurisés sur leurs appareils <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
+  <string name="setup_unlock">Déverrouiller</string>
+  <string name="setup_device_locked">Cet appareil a été verrouillé par l\'utilisateur.</string>
+  <string name="setup_require_cyanogen_label"><b>Nécessite votre mot de passe du compte Cyanogen OS</b> afin d\'utiliser votre appareil même après une réinitialisation d\'usine.</string>
+  <string name="setup_device_locked_instructions"><i>Pour activer/désactiver cette fonction, veuillez vous rendre dans Paramètres &gt; Sécurité</i></string>
+  <string name="setup_warning_skip_anyway">Sans un compte Cyanogen OS, vous ne serez pas en mesure de :\n\nPersonnaliser votre téléphone avec de nouvelles icônes, fonds d\'écran et plus encore dans l\'application Thèmes\n\nLocaliser ou réinitialiser votre téléphone à distance s\'il est perdu</string>
 </resources>
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -65,4 +65,9 @@
  <string name="services_os_nav_keys_label"><b>A képernyő navigációs gombjainak használata</b> a hardveres gombok helyett.</string>
  <string name="services_use_secure_sms">Biztonságos SMS használata</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g> az SMS beszélgetések titkosításához más olyan felhasználókkal, akik szintén biztonságos SMS-t használnak <xliff:g id="name" example="CyanogenMod">%s</xliff:g> eszközön.</string>
+  <string name="setup_unlock">Feloldás</string>
+  <string name="setup_device_locked">Ezt az eszközt a felhasználó zárolta.</string>
+  <string name="setup_require_cyanogen_label"><b>Cyanogen OS fiókjának jelszava szükséges</b> a készülék használatához, még a gyári beállítások visszaállítása után is.</string>
+  <string name="setup_device_locked_instructions"><i>A szolgáltatás ki/be kapcsolásához, kérjük menjen ide: Beállítások &gt; Biztonság</i></string>
+  <string name="setup_warning_skip_anyway">Cyanogen OS fiók nélkül nem fog hozzáférni a következőkhöz:\n\nTelefon testreszabása új ikonokkal, háttérképekkel és egyebekkel a Téma kezelő alkalmazáson keresztül\n\nTelefon helyének maghatározása, vagy távolról való törlése, ha elveszett</string>
 </resources>
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -65,4 +65,9 @@
  <string name="services_os_nav_keys_label"><b>Usa i pulsanti virtuali a schermo</b> invece di quelli fisici.</string>
  <string name="services_use_secure_sms">Utilizza SMS sicuri</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g> per criptare le conversazioni SMS con altri utenti che utilizzano gli SMS sicuri su un dispositivo <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
+  <string name="setup_unlock">Sblocca</string>
+  <string name="setup_device_locked">Questo dispositivo è stato bloccato dall\'utente.</string>
+  <string name="setup_require_cyanogen_label"><b>È necessaria la password del tuo account Cyanogen OS</b> al fine di utilizzare il dispositivo anche dopo il ripristino di fabbrica.</string>
+  <string name="setup_device_locked_instructions"><i>Per attivare e disattivare questa funzione, vai in Impostazioni &gt; Sicurezza</i></string>
+  <string name="setup_warning_skip_anyway">\"Senza un account Cyanogen OS, non sarai in grado di:\n\nPersonalizzare il telefono con nuove icone, sfondi ed altro ancora dall\'app Temi\n\nLocalizzare o formattare da remoto il telefono se viene smarrito\"</string>
 </resources>
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -65,4 +65,9 @@
  <string name="services_os_nav_keys_label"><b>השתמש במקשי הניווט במסך</b> במקום במקשים הפיזיים.</string>
  <string name="services_use_secure_sms">השתמש ב-SMS מאובטח</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g> להצפנת שיחות SMS עם משתמשים אחרים באמצעות SMS מאובטח במכשיר <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
+  <string name="setup_unlock">שחרר</string>
+  <string name="setup_device_locked">מכשיר זה ננעל על-ידי המשתמש.</string>
+  <string name="setup_require_cyanogen_label"><b>נדרשת סיסמת חשבון מערכת Cyanogen</b> על מנת להשתמש במכשירך, אפילו לאחר איפוס המכשיר להגדרות היצרן.</string>
+  <string name="setup_device_locked_instructions"><i>כדי להפעיל/לכבות אפשרות זו, אנא גש להגדרות &gt; אבטחה</i></string>
+  <string name="setup_warning_skip_anyway">בלי חשבון מערכת Cyanogen, לא ניתן יהיה:\n\nלהתאים את מכשירך עם סמלים, רקעים ועוד ביישום ערכות העיצוב\n\nלאתר או למחוק מרחוק את מכשירך במקרה של אובדן</string>
 </resources>
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-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.
-->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">ಸೆಟಪ್ ವಿಝಾರ್ಡ್</string>
-  <string name="next">ಮುಂದೆ</string>
-  <string name="skip">ಸ್ಕಿಪ್</string>
-  <string name="start">ಪ್ರಾರಂಭಿಸಿ</string>
-  <string name="ok">ಆಯ್ತು</string>
-  <string name="loading">ಒಂದೇ ಒಂದು ಕ್ಷಣ\u2026</string>
-  <string name="setup_complete">ಸೆಟಪ್ ಪೂರ್ಣಗೊಂಡಿದೆ</string>
-  <string name="setup_welcome">ಸುಸ್ವಾಗತ</string>
-  <string name="setup_wifi">ವೈ-ಫೈ ಆಯ್ಕೆಮಾಡಿ</string>
-  <string name="setup_sim_missing">ಸಿಮ್ ಕಾರ್ಡ್ ಇಲ್ಲ</string>
-  <string name="setup_choose_data_sim">ಡೇಟಾಗಾಗಿ ಒಂದು ಸಿಮ್ ಆರಿಸಿ</string>
-  <string name="setup_location">ಸ್ಥಳ ಸೇವೆಗಳು</string>
-  <string name="setup_other">ಇತರೆ ಸೇವೆಗಳು</string>
-  <string name="setup_datetime">ದಿನಾಂಕ &amp; ಸಮಯ</string>
-  <string name="setup_current_date">ಪ್ರಸ್ತುತ ದಿನಾಂಕ</string>
-  <string name="setup_current_time">ಪ್ರಸ್ತುತ ಸಮಯ</string>
-  <string name="sim_missing_summary" product="tablet">ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‍ನಲ್ಲಿ ಸಿಮ್ ಕಾರ್ಡ್ ಪತ್ತೆಯಾಗಿಲ್ಲ. ಸಿಮ್‍ ಕಾರ್ಡ್ ಅಳವಡಿಸಲು, ನಿಮ್ಮ ಸಾಧನದೊಂದಿಗೆ ಬಂದಿರುವ ಸೂಚನೆಗಳನ್ನು ಓದಿ.</string>
-  <string name="sim_missing_summary" product="default">ನಿಮ್ಮ ಫೋನ್‍ನಲ್ಲಿ ಸಿಮ್ ಕಾರ್ಡ್ ಪತ್ತೆಯಾಗಿಲ್ಲ. ಸಿಮ್‍ ಕಾರ್ಡ್ ಅಳವಡಿಸಲು, ನಿಮ್ಮ ಸಾಧನದೊಂದಿಗೆ ಬಂದಿರುವ ಸೂಚನೆಗಳನ್ನು ಓದಿ.</string>
-  <string name="choose_data_sim_summary" product="tablet">ನೀವು ಡೇಟಾಗಾಗಿ ಯಾವ ಸಿಮ್ ಉಪಯೋಗಿಸಲು ಬಯಸುವಿರಿ? ಆಯ್ಕೆಮಾಡಿರುವ ಸಿಮ್ ನೆಟ್‍ವರ್ಕ್ ಶುಲ್ಕಗಳಿಗೆ ಗುರಿಯಾಗಬಹುದು ಏಕೆಂದರೆ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟನ್ನು ಸೆಟಪ್ ಮಾಡಲು ಇದನ್ನು ಉಪಯೋಗಿಸಲಾಗುತ್ತದೆ.</string>
-  <string name="choose_data_sim_summary" product="default">ನೀವು ಡೇಟಾಗಾಗಿ ಯಾವ ಸಿಮ್ ಉಪಯೋಗಿಸಲು ಬಯಸುವಿರಿ? ಆಯ್ಕೆಮಾಡಿರುವ ಸಿಮ್ ನೆಟ್‍ವರ್ಕ್ ಶುಲ್ಕಗಳಿಗೆ ಗುರಿಯಾಗಬಹುದು ಏಕೆಂದರೆ ನಿಮ್ಮ ಫೋನನ್ನು ಸೆಟಪ್ ಮಾಡಲು ಇದನ್ನು ಉಪಯೋಗಿಸಲಾಗುತ್ತದೆ.</string>
-  <string name="date_time_summary">ಅಗತ್ಯವಿದ್ದಲ್ಲಿ ನಿಮ್ಮ ಸಮಯ ವಲಯವನ್ನು ಹಾಗು ಪ್ರಸ್ತುತ ದಿನಾಂಕ ಮತ್ತು ಸಮಯವನ್ನು ಹೊಂದಿಸಿ</string>
-  <string name="backup_data_summary">ಆಪ್ ಡೇಟಾ, ವೈ-ಫೈ ಪ್ರವೇಶಪದಗಳು, ಮತ್ತು ಇತರೆ ಸೆಟ್ಟಿಂಗ್‍ಗಳನ್ನು ಗೂಗಲ್ ಸರ್ವರ್‍ಗಳಿಗೆ <b>ಬ್ಯಾಕ್ಅಪ್</b> ಮಾಡು</string>
-  <string name="other_services_summary">ಈ ಸೇವೆಗಳು ಗೂಗಲನ್ನು ನಿಮ್ಮ ಸೇವೆಗೆ ನಿಯೋಜಿಸುತ್ತದೆ, ಹಾಗು ನೀವು ಅವುಗಳ್ಳನ್ನು ಯಾವ ಸಮಯದಲ್ಲಾದರೂ ಆನ್ ಅಥವ ಆಫ್ ಮಾಡಬಹುದು. ಡೇಟಾವನ್ನು ಗೂಗಲ್‍ನ <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ಅನುಸಾರವಾಗಿ ಉಪಯೋಗಿಸಲಾಗುತ್ತದೆ.</string>
-  <string name="location_services_summary">ಸ್ಥಳ ಸೇವೆಗಳು ಸಿಸ್ಟಂ ಹಾಗು ತೃತೀಯ ಪಕ್ಷೀಯ ಆಪ್‍ಗಳಿಗೆ ನಿಮ್ಮ ಅಂದಾಜು ಸ್ಥಳದಂತಹ ಡೇಟಾವನ್ನು ಸಂಗ್ರಹಿಸಲು ಮತ್ತು ಉಪಯೋಗಿಸಲು ಅನುಮತಿಸುತ್ತದೆ. ಉದಾಹರಣೆಗೆ, ಒಂದು ಆಪ್ ನಿಮ್ಮ ಅಂದಾಜು ಸ್ಥಳವನ್ನು ಹತ್ತಿರದ ಕಾಫಿ ಶಾಪ್‍ಗಳನ್ನು ಪತ್ತೆಹಚ್ಚಲು ಉಪಯೋಗಿಸಬಹುದು.</string>
-  <string name="location_access_summary"><b>ನಿಮ್ಮ ಅನುಮತಿಗಳನ್ನು ಕೇಳಿರುವ ಆಪ್‍ಗಳಿಗೆ</b> ನಿಮ್ಮ ಸ್ಥಳದ ಮಾಹಿತಿಯನ್ನು ಉಪಯೋಗಿಸಲು ಅನುಮತಿಸುತ್ತದೆ. ಇದು ನಿಮ್ಮ ಪ್ರಸ್ತುತ ಸ್ಥಳ ಮತ್ತು ಹಿಂದಿನ ಸ್ಥಳಗಳನ್ನೂ ಒಳಗೊಂಡಿರಬಹುದು.</string>
-  <string name="location_gps" product="tablet">ಆಪ್‍ಗಳಿಗೆ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‍ನಲ್ಲಿ ಜಿಪಿಎಸ್ ಉಪಯೋಗಿಸಲು ಅನುಮತಿಸುವ ಮೂಲಕ <b>ಸ್ಥಳ ನಿಖರತೆಯನ್ನು ಉತ್ತಮಗೊಳಿಸಿ</b>.</string>
-  <string name="location_gps" product="default">ಆಪ್‍ಗಳಿಗೆ ನಿಮ್ಮ ಫೋನ್‍ನಲ್ಲಿ ಜಿಪಿಎಸ್ ಉಪಯೋಗಿಸಲು ಅನುಮತಿಸುವ ಮೂಲಕ <b>ಸ್ಥಳ ನಿಖರತೆಯನ್ನು ಉತ್ತಮಗೊಳಿಸಿ</b>.</string>
-  <string name="location_network">ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ನಿರ್ಧರಿಸಲು ಆಪ್‍ಗಳಿಗೆ ಸಹಕರಿಸಲು <b>ವೈಫೈ ಉಪಯೋಗಿಸಿ</b>.</string>
-  <string name="location_network_telephony">ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ನಿರ್ಧರಿಸಲು ಆಪ್‍ಗಳಿಗೆ ಸಹಕರಿಸಲು <b>ವೈಫೈ ಹಾಗು ಮೊಬೈಲ್ ನೆಟ್‍ವರ್ಕ್ ಉಪಯೋಗಿಸಿ</b>.</string>
-  <string name="location_network_gms">ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ನಿರ್ಧರಿಸಲು ಆಪ್‍ಗಳಿಗೆ ಸಹಕರಿಸಲು <b>ಗೂಗಲ್‍ನ ಸ್ಥಳ ಸೇವೆಯನ್ನು ಉಪಯೋಗಿಸಿ</b>. ಇದರರ್ಥ ಅಜ್ಞಾತ ಸ್ಥಳ ಡೇಟಾವನ್ನು ಗೂಗಲ್‍ಗೆ ಕಳುಹಿಸುವುದು. ಯಾವುದೇ ಆಪ್‍ಗಳು ಚಾಲನೆಯಲ್ಲಿರದಿರುವಾಗಲೂ ಸಹ.</string>
-  <string name="setup_mobile_data">ಮೊಬೈಲ್ ಡೇಟಾ ಆನ್ ಮಾಡಿ</string>
-  <string name="setup_mobile_data_no_service">ಯಾವುದೇ ಸೇವೆ ಇಲ್ಲ</string>
-  <string name="setup_mobile_data_emergency_only">ತುರ್ತುಪರೀಸ್ಥಿತಿ ಕರೆಗಳು ಮಾತ್ರ</string>
-  <string name="enable_mobile_data_summary">ಸೆಟಪ್ ಮಾಡುವಾಗ ನೀವು ಮೊಬೈಲ್ ಡೇಟಾ ಉಪಯೋಗಿಸಲು ಬಯಸುವಿರಾ? ಮೊಬೈಲ್ ಡೇಟಾ ಆನ್ ಮಾಡುವುದರಿಂದ ನೀವು ಡೇಟಾ ಶುಲ್ಕಕ್ಕೆ ಗುರಿಯಾಗಬಹುದು.</string>
-  <string name="no">ಬೇಡ</string>
-  <string name="yes">ಹೌದು</string>
-  <string name="data_sim_name">ಸಿಮ್ <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
-  <string name="emergency_call">ತುರುಪರೀಸ್ಥಿತಿ ಕರೆ</string>
-  <string name="setup_services">Cyanogen ವೈಶಿಷ್ಟ್ಯಗಳು</string>
-  <string name="services_explanation" product="tablet">ಈ ಸೇವೆಗಳು ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‍ನ ಸಾಮಾರ್ಥ್ಯಗಳನ್ನು ವಿಸ್ತರಿಸಲು ನಿಮಗಾಗಿ ಕೆಲಸ ಮಾಡುತ್ತದೆ. ಡೇಟಾವನ್ನು Cyanogenನ <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ಅನುಸಾರವಾಗಿ ಉಪಯೋಗಿಸಲಾಗುತ್ತದೆ.</string>
-  <string name="services_explanation" product="default">ಈ ಸೇವೆಗಳು ನಿಮ್ಮ ಫೋನ್‍ನ ಸಾಮಾರ್ಥ್ಯಗಳನ್ನು ವಿಸ್ತರಿಸಲು ನಿಮಗಾಗಿ ಕೆಲಸ ಮಾಡುತ್ತದೆ. ಡೇಟಾವನ್ನು Cyanogenನ <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ಅನುಸಾರವಾಗಿ ಉಪಯೋಗಿಸಲಾಗುತ್ತದೆ.</string>
-  <string name="services_privacy_policy">ಗೌಪ್ಯತಾ ನೀತಿ</string>
-  <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g> ಸುಧಾರಿಸಲು ಸಹಕರಿಸಿ</string>
-  <string name="services_metrics_label">Cyanogenಗೆ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ವಿಶ್ಲೇಷಣಾತ್ಮಕ ಮತ್ತು ಬಳಕೆಯ ಡೇಟಾವನ್ನು ಕಳುಹಿಸುವುದರಿಂದ <xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g>. ಈ ಮಾಹಿತಿಯನ್ನು ನಿಮ್ಮನ್ನು ಗುರುತಿಸುವುದಕ್ಕಾಗಿ ಉಪಯೋಗಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ ಮತ್ತು ಇದನ್ನು ಬ್ಯಾಟರಿ ಲೈಫ್, ಆಪ್ ಕಾರ್ಯಕ್ಷಮತೆ, ಮತ್ತು ಹೊಸ <xliff:g id="name" example="CyanogenMod">%s</xliff:g> ವೈಶಿಷ್ಟ್ಯಗಳಲ್ಲಿ ಕೆಲಸಮಾಡುವ ತಂಡಗಳಿಗೆ ನೀಡಲಾಗುವುದು.</string>
-  <string name="services_apply_theme"><xliff:g id="name" example="Material">%s</xliff:g> ಥೀಮ್ ಅನ್ವಯಿಸಿ</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> ವಿಶಿಷ್ಟ್ಯವಾದ ಐಕಾನ್ಸ್, ವಾಲ್‍ಪೇಪರ್‍ಗಳು, ಮತ್ತು ಫಾಂಟ್ಸನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುತ್ತಿದೆ.</string>
-  <string name="services_os_nav_keys_label">ಹಾರ್ಡ್‍ವೇರ್ ಕೀಗಳ ಬದಲಾಗಿ <b>ಪರದೆಯ ಮೇಲಿನ ನಾವಿಗೇಶನ್ ಕೀಗಳನ್ನು ಉಪಯೋಗಿಸಿ</b>.</string>
-  <string name="services_use_secure_sms">ಸುರಕ್ಷಿತ ಎಸ್ಎಂಎಸ್ ಉಪಯೋಗಿಸಿ</string>
-  <string name="services_secure_sms_label"><xliff:g id="name" example="CyanogenMod">%s</xliff:g> ಸಾಧನದಲ್ಲಿ ಇತರೆ ಬಳಕೆದಾರರ ಜೊತೆಗಿನ ಎಸ್ಎಂಎಸ್ ಸಂಭಾಷಣೆಗಳನ್ನು ಸುರಕ್ಷಿತ ಎಸ್ಎಂಎಸ್ ಉಪಯೋಗಿಸಿ ಎನ್ಕ್ರಿಪ್ಟ್ ಮಾಡಲು <xliff:g id="name" example="Use secure SMS">%s</xliff:g>.</string>
-</resources>
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -26,7 +26,7 @@
  <string name="setup_welcome">환영합니다</string>
  <string name="setup_wifi">Wi-Fi 연결</string>
  <string name="setup_sim_missing">SIM 카드 없음</string>
-  <string name="setup_choose_data_sim">모바일 데이터용 SIM 카드 선택</string>
+  <string name="setup_choose_data_sim">데이터 통신용 SIM 카드 선택</string>
  <string name="setup_location">위치 서비스</string>
  <string name="setup_other">기타 서비스</string>
  <string name="setup_datetime">날짜 및 시간</string>
@@ -34,8 +34,8 @@
  <string name="setup_current_time">현재 시간</string>
  <string name="sim_missing_summary" product="tablet">태블릿에서 SIM 카드가 감지되지 않았습니다. SIM 카드를 삽입하려면 기기와 함께 제공된 설명을 읽어보십시오.</string>
  <string name="sim_missing_summary" product="default">휴대전화에서 SIM 카드가 감지되지 않았습니다. SIM 카드를 삽입하려면 기기와 함께 제공된 설명을 읽어보십시오.</string>
-  <string name="choose_data_sim_summary" product="tablet">모바일 데이터를 위해 어느 카드를 사용하시겠습니까? 태블릿을 설정하는 동안 선택한 SIM 카드에서 통신 요금이 발생할 수 있습니다.</string>
-  <string name="choose_data_sim_summary" product="default">모바일 데이터를 위해 어느 카드를 사용하시겠습니까? 휴대전화를 설정하는 동안 선택한 SIM 카드에서 통신 요금이 발생할 수 있습니다.</string>
+  <string name="choose_data_sim_summary" product="tablet">데이터 통신을 위해 어느 카드를 사용하시겠습니까? 태블릿을 설정하는 동안 선택한 SIM 카드에서 통신 요금이 발생할 수 있습니다.</string>
+  <string name="choose_data_sim_summary" product="default">데이터 통신을 위해 어느 카드를 사용하시겠습니까? 휴대전화를 설정하는 동안 선택한 SIM 카드에서 통신 요금이 발생할 수 있습니다.</string>
  <string name="date_time_summary">시간대를 설정하고 필요한 경우 현재 날짜 및 시간을 조정</string>
  <string name="backup_data_summary">앱 데이터, Wi-Fi 비밀번호 그리고 기타 설정을 Google 서버에 <b>백업합니다</b></string>
  <string name="other_services_summary">이 Google 서비스는 사용자가 실행하며, 언제든지 켜고 끌 수 있습니다. 데이터는 Google의 <xliff:g id="name" example="Privacy Policy">%s</xliff:g>에 따라 사용됩니다.</string>
@@ -46,10 +46,10 @@
  <string name="location_network">앱이 사용자의 위치를 확인할 수 있도록 <b>Wi-FI를 사용합니다</b>.</string>
  <string name="location_network_telephony">앱이 사용자의 위치를 확인할 수 있도록 <b>Wi-FI와 모바일 네트워크를 사용합니다</b>.</string>
  <string name="location_network_gms">앱이 사용자의 위치를 정확하게 확인할 수 있도록 <b>Google 위치 서비스를 사용합니다</b>. 앱을 사용하지 않을때도 익명 위치 정보가 Google에 전송됩니다.</string>
-  <string name="setup_mobile_data">모바일 데이터 켜기</string>
+  <string name="setup_mobile_data">데이터 통신 켜기</string>
  <string name="setup_mobile_data_no_service">서비스 불가</string>
  <string name="setup_mobile_data_emergency_only">긴급 통화만 가능</string>
-  <string name="enable_mobile_data_summary">설정할 동안 모바일 데이터를 사용하시겠습니까? 모바일 데이터를 켜면 통신요금이 부과될 수 있습니다.</string>
+  <string name="enable_mobile_data_summary">설정할 동안 데이터 통신을 사용하시겠습니까? 데이터 통신을 켜면 통신요금이 부과될 수 있습니다.</string>
  <string name="no">아니오</string>
  <string name="yes">예</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -65,4 +65,10 @@
  <string name="services_os_nav_keys_label">하드웨어 키 대신 <b>화면 상의 내비게이션 키</b>를 사용합니다.</string>
  <string name="services_use_secure_sms">보안 SMS 사용</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="보안 SMS를 사용">%s</xliff:g>하여 <xliff:g id="name" example="CyanogenMod">%s</xliff:g>기기에서 보안 SMS를 사용하는 다른 사용자와의 SMS 대화를 암호화함.</string>
+  <string name="setup_unlock">잠금 해제</string>
+  <string name="setup_device_locked">이 기기는 사용자에 의해 잠겨 있습니다.</string>
+  <string name="setup_require_cyanogen_label">공장 초기화 후에도 기기를 사용하려면 <b>Cyanogen OS 계정의 비밀번호가 필요합니다</b> .</string>
+  <string name="setup_device_locked_instructions"><i>이 기능을 켜거나 끄려면, 설정 &gt; 보안으로 이동하세요</i></string>
+  <string name="setup_warning_skip_anyway">Cyanogen OS 계정이 없을 경우 사용할 수 없는 기능:\n\n
+테마 앱을 통한 새로운 아이콘, 배경화면 등의 적용\n\n기기를 잃어버렸을 경우 기기 찾기 또는 원격 개인정보 삭제</string>
 </resources>
--- a/res/values-ku/strings.xml
+++ b/res/values-ku/strings.xml
@@ -21,7 +21,6 @@
  <string name="skip">تێپەڕاندن</string>
  <string name="start">دەستپێکردن</string>
  <string name="ok">باشه‌</string>
-  <string name="loading">تەنها چرکەیەک\u2026</string>
  <string name="setup_complete">دامه‌زراندن ته‌واوبوو</string>
  <string name="setup_welcome">بە خێربێيت</string>
  <string name="setup_wifi">هەڵبژاردنی Wi-Fi</string>
@@ -29,7 +28,7 @@
  <string name="setup_choose_data_sim">سیمکارتێک هەڵبژێرە بۆ داتا</string>
  <string name="setup_location">خزمەتگوزاری ناوچەی</string>
  <string name="setup_other">خزمەتگوزاری تر</string>
-  <string name="setup_datetime">کات وamp; ڕۆژ</string>
+  <string name="setup_datetime">ڕۆژ &amp; کات</string>
  <string name="setup_current_date">ڕۆژی هه‌نووکه‌</string>
  <string name="setup_current_time">کاتی هه‌نووکه‌</string>
  <string name="sim_missing_summary" product="tablet">سیمکارت لە ناو تاتەبژمێر نیە. بۆ تێکردنی سیمکارت ، تێبینیەکان بخوێنەرەوە کە لەگەڵ ئامێرەکەت هاتوە.</string>
@@ -40,12 +39,13 @@
  <string name="backup_data_summary"><b>پاڵپشتی</b> داتای بەرنامە, Wi-Fi تێپەڕەوشە, و ڕێکخستنی تری خزمەتگووزاری گووگڵ</string>
  <string name="other_services_summary">ئەم خزمەتگوزاریە گووگڵ دەخاتە یارمەتی تۆوە، و ئەتوانی بیانکەیتەوە یان بیانکوژێنیتەوە لە هەرکاتێکدا.
 داتاکە لەگەڵ گووگڵ بەکارئەهێنرێت <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-  <string name="setup_mobile_data">کردنەوەی مۆبایل داتا</string>
  <string name="setup_mobile_data_no_service">خزمەتگوزاری نیە</string>
  <string name="setup_mobile_data_emergency_only">ته‌نها په‌یوه‌ندی كتوپڕ</string>
  <string name="no">نەخێر</string>
  <string name="yes">بەڵێ</string>
+  <string name="data_sim_name">سیم <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
  <string name="emergency_call">تەلەفۆنی فریاگوزاری</string>
  <string name="setup_services">شێوازی ساینەجن</string>
  <string name="services_privacy_policy">یاسای تایبەتی</string>
+  <string name="setup_unlock">کردنەوە</string>
 </resources>
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -48,7 +48,7 @@
  <string name="setup_mobile_data">Mobil Daten uschalten</string>
  <string name="setup_mobile_data_no_service">Kee Service</string>
  <string name="setup_mobile_data_emergency_only">Just Noutriff</string>
-  <string name="enable_mobile_data_summary">Wëlls du mobil Date während der Installatioun benotzen? Duerch d\'Uschalte vu mobillen Date kënnen Zousazkäschten entstoen.</string>
+  <string name="enable_mobile_data_summary">Wëlls du mobil Date während der Installatioun benotzen? Duerch d\'Uschalte vu mobilen Date kënnen Zousazkäschten entstoen.</string>
  <string name="no">Nee</string>
  <string name="yes">Jo</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -58,4 +58,7 @@
  <string name="services_help_improve_cm">Hëllef <xliff:g id="name" example="CyanogenMod">%s</xliff:g> ze verbesseren</string>
  <string name="services_apply_theme">Den Design <xliff:g id="name" example="Material">%s</xliff:g> applizéieren</string>
  <string name="services_use_secure_sms">Sécher SMSe benotzen</string>
+  <string name="setup_unlock">Entspären</string>
+  <string name="setup_device_locked">Dësen Apparat gouf duerch de Benotzer gespaart.</string>
+  <string name="setup_device_locked_instructions"><i>Fir dës Funktioun z\'aktivéieren/desaktivéieren, géi op Astellungen  &gt; Sécherheet</i></string>
 </resources>
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -65,4 +65,9 @@
  <string name="services_os_nav_keys_label"><b>Naudokite ekrane rodomus naršymo klavišus</b> vietoj aparatūrinių klavišų.</string>
  <string name="services_use_secure_sms">Naudoti saugius SMS</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g>, kad užšifruoti SMS pokalbius su kitais vartotojais, naudojančiais saugius SMS <xliff:g id="name" example="CyanogenMod">%s</xliff:g> įrenginyje.</string>
+  <string name="setup_unlock">Atrakinti</string>
+  <string name="setup_device_locked">Šis įrenginys buvo užrakintas naudotojo.</string>
+  <string name="setup_require_cyanogen_label"><b>Reikalauti jūsų „Cyanogen“ OS paskyros slaptažodžio</b> , kad būtų galima naudotis įrenginiu net ir po gamyklinių nustatymų iš naujo.</string>
+  <string name="setup_device_locked_instructions"><i>Kad išjungtumėte / įjungtumėte šią funkciją, eikite į Nustatymai &gt; Sauga</i></string>
+  <string name="setup_warning_skip_anyway">Be „Cyanogen“ OS paskyros, jums nebus suteikta galimybė:\n\nTemų programoje tinkinti savo telefoną su naujomis piktogramomis, ekrano fonais ir daugiau\n\nRasti arba nuotoliniu būdu ištrinti savo telefoną, jei jis yra prarastas</string>
 </resources>
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -65,4 +65,9 @@
  <string name="services_os_nav_keys_label"><b>Bruk navigasjonstaster på skjermen </b> istedenfor hardware knapper.</string>
  <string name="services_use_secure_sms">Bruk sikker SMS</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g> for å kryptere SMS samtaler med andre som også bruker sikker SMS på en <xliff:g id="name" example="CyanogenMod">%s</xliff:g> enhet.</string>
+  <string name="setup_unlock">Lås opp</string>
+  <string name="setup_device_locked">Denne enheten er låst av brukeren.</string>
+  <string name="setup_require_cyanogen_label"><b>Krever passordet til Cyanogen OS konto</b> for å bruke enheten etter en fabrikkgjennoppretting.</string>
+  <string name="setup_device_locked_instructions"><i>For å slå denne funksjonen av/på, kan du gå til Innstillinger &gt; sikkerhet</i></string>
+  <string name="setup_warning_skip_anyway">Uten en Cyanogen OS konto, vil du ikke kunne: \n\nEndre på telefonen med nye ikoner, bakgrunnsbilder og mer i temaer-app\n\nLokalisere eller eksternt slette telefonen hvis du har mistet den</string>
 </resources>
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -65,4 +65,9 @@
  <string name="services_os_nav_keys_label"><b>On-screen navigatieknoppen</b> gebruiken in plaats van de hardwareknoppen.</string>
  <string name="services_use_secure_sms">Beveiligde sms-berichten gebruiken</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g> om sms-gesprekken te versleutelen met anderen die ook beveiligde sms-berichten gebruiken op een <xliff:g id="name" example="CyanogenMod">%s</xliff:g>-apparaat.</string>
+  <string name="setup_unlock">Ontgrendelen</string>
+  <string name="setup_device_locked">Dit apparaat is vergrendeld door de gebruiker.</string>
+  <string name="setup_require_cyanogen_label"><b>Uw Cyanogen OS-accountwachtwoord vereisen</b> om het apparaat te gebruiken, zelfs na terugzetten naar fabrieksinstellingen.</string>
+  <string name="setup_device_locked_instructions"><i>Om deze functie in of uit te schakelen, ga naar Instellingen &gt; Beveiliging</i></string>
+  <string name="setup_warning_skip_anyway">Zonder een Cyanogen OS-account kunt u niet:\n\nUw telefoon personaliseren met nieuwe pictogrammen, achtergronden en meer in de app Thema\'s\n\nUw telefoon lokaliseren of op afstand wissen wanneer u deze kwijt raakt</string>
 </resources>
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -65,4 +65,9 @@
  <string name="services_os_nav_keys_label"><b>Użyj ekranowych przycisków nawigacyjnych</b> zamiast klawiszy sprzętowych.</string>
  <string name="services_use_secure_sms">Używaj bezpiecznych wiadomości SMS</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g>, aby prowadzić szyfrowane konwersacje z innymi użytkownikami używając bezpiecznych SMS na urządzeniach z <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
+  <string name="setup_unlock">Odblokuj</string>
+  <string name="setup_device_locked">To urządzenie zostało zablokowane przez użytkownika.</string>
+  <string name="setup_require_cyanogen_label"><b>Wymaga hasła twojego konta Cyanogen OS</b>, aby korzystać z urządzenia, nawet po przywróceniu ustawień fabrycznych.</string>
+  <string name="setup_device_locked_instructions"><i>Aby włączyć/wyłączyć tę funkcję, przejdź do Ustawienia &gt; Zabezpieczenia</i></string>
+  <string name="setup_warning_skip_anyway">Bez Konta Cyanogen OS nie będziesz w stanie:\n\nDostosować swojego telefonu wybierając nowe ikony, tapety oraz więcej innych opcji w aplikacji Motywy\n\nZlokalizować lub zdalnie wymazać pamięć telefonu w przypadku zgubienia</string>
 </resources>
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -65,4 +65,9 @@
  <string name="services_os_nav_keys_label"><b>Use as teclas de navegação na tela</b> em vez de botões físicos.</string>
  <string name="services_use_secure_sms">Usar SMS seguro</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g> para criptografar conversas SMS com outros usuários que usam o SMS seguro em um dispositivo <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
+  <string name="setup_unlock">Desbloquear</string>
+  <string name="setup_device_locked">Este dispositivo foi bloqueado pelo usuário.</string>
+  <string name="setup_require_cyanogen_label"><b>Exigir a senha da conta Cyanogen</b> para usar o dispositivo mesmo depois da restauração de fábrica.</string>
+  <string name="setup_device_locked_instructions"><i>Para ativar ou desativar este recurso, por favor vá para Configurações e Segurança</i></string>
+  <string name="setup_warning_skip_anyway">Sem uma conta Cyanogen, você não será capaz de:\n\nPersonalizar seu celular com novos ícones, papéis de parede e muito mais no app Temas\n\nLocalizar ou apagar remotamente o seu telefone se for perdido</string>
 </resources>
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -65,4 +65,9 @@
  <string name="services_os_nav_keys_label"><b>Usar os botões de navegação no ecrã</b>, em vez dos botões do dispositivo.</string>
  <string name="services_use_secure_sms">Usar SMS seguras</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g> para encriptar conversações SMS com outros utilizadores que também utilizem este serviço num dispositivo com a <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
+  <string name="setup_unlock">Desbloquear</string>
+  <string name="setup_device_locked">Este dispositivo foi bloqueado pelo utilizador.</string>
+  <string name="setup_require_cyanogen_label"><b>Exigir a palavra-passe da conta Cyanogen OS</b> para usar o dispositivo mesmo depois da reposição dos dados de fábrica.</string>
+  <string name="setup_device_locked_instructions"><i>Para ativar ou desativar este recurso, por favor vá a Definições &gt; Segurança</i></string>
+  <string name="setup_warning_skip_anyway">\"Sem uma conta Cyanogen OS, não será capaz de: \n\nPersonalizar o telefone com novos ícones, imagens de fundo e muito mais na aplicação de Temas\n\n Localizar ou apagar remotamente o seu telefone se estiver perdido</string>
 </resources>
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -17,48 +17,24 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <string name="app_name">Expert de instalare</string>
-  <string name="next">Următoarea</string>
  <string name="skip">Omite</string>
  <string name="start">Pornire</string>
  <string name="ok">OK</string>
  <string name="loading">Doar o secundă\u2026</string>
  <string name="setup_complete">Configurarea este completă</string>
  <string name="setup_welcome">Bine ați venit</string>
-  <string name="setup_wifi">Selectați Wi-Fi</string>
+  <string name="setup_wifi">Selectaţi Wi-Fi</string>
  <string name="setup_sim_missing">Lipsă card SIM</string>
-  <string name="setup_choose_data_sim">Alege un SIM pentru date</string>
  <string name="setup_location">Servicii de localizare</string>
  <string name="setup_other">Alte servicii</string>
  <string name="setup_datetime">Dată &amp; oră</string>
  <string name="setup_current_date">Data curentă</string>
  <string name="setup_current_time">Ora curentă</string>
-  <string name="sim_missing_summary" product="tablet">O cartelă SIM nu a fost detectată în tableta dvs. Pentru a insera o cartelă SIM, citiți instrucțiunile care au venit cu aparatul dvs.</string>
-  <string name="sim_missing_summary" product="default">O cartelă SIM nu a fost detectată în telefonul dvs. Pentru a insera o cartelă SIM, citiți instrucțiunile care au venit cu aparatul dvs.</string>
-  <string name="choose_data_sim_summary" product="tablet">Ce cartelă SIM vreți să utilizați pentru date? Cartela SIM selectată v-ar putea costa adițional în timp ce e folosită pentru a configura tableta dvs.</string>
-  <string name="choose_data_sim_summary" product="default">Ce cartelă SIM vreți să utilizați pentru date? Cartela SIM selectată v-ar putea costa adițional în timp ce e folosită pentru a configura telefonul dvs.</string>
-  <string name="date_time_summary">Setați fusul orar și reglați data și ora curentă, dacă este necesar</string>
-  <string name="backup_data_summary"><b>Back up</b> datele aplicațiilor, parolele Wi-Fi și alte setări pe serverele Google</string>
-  <string name="other_services_summary">Aceste servicii pun Google să lucreze pentru tine, și puteți să le activați sau dezactivați în orice moment. Datele vor fi folosite în conformitate cu Google <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-  <string name="location_services_summary">Serviciul de localizare permite Hărți și altor aplicații să adune și să folosească date precum locația aproximativă. De exemplu, Hărți poate utiliza locația aproximativă pentru a localiza cafenele în vecinătate.</string>
-  <string name="location_access_summary"><b>Permite aplicațiilor care au cerut permisiunea</b> să utilizeze informațiile despre locația dvs. Aceasta poate include locația curentă și locațiile precedente.</string>
-  <string name="location_gps" product="tablet"><b>Îmbunătățeste precizia locației</b> permițând aplicațiilor să folosească GPS-ul pe tabletă.</string>
-  <string name="location_gps" product="default"><b>Îmbunătățeste precizia locației</b> permițând aplicațiilor să folosească GPS-ul pe telefon.</string>
-  <string name="location_network"><b>Folosește Wi-Fi</b> pentru a ajuta aplicațiile să vă determine locația.</string>
-  <string name="location_network_telephony"><b>Utilizează Wi-Fi și rețelele de telefonie mobilă</b> pentru a ajuta aplicațiile să vă determine locația.</string>
-  <string name="location_network_gms"><b>Folosește serviciile de locație Google</b> pentru a ajuta aplicațiile să vă determine locația. Acest lucru înseamnă trimiterea datelor anonime de localizare la Google, chiar și atunci când nu executați aplicații.</string>
  <string name="setup_mobile_data">Porniți datele mobile</string>
-  <string name="setup_mobile_data_no_service">Lipsă semnal</string>
  <string name="setup_mobile_data_emergency_only">Numai apeluri de urgenţă</string>
-  <string name="enable_mobile_data_summary">Doriți să utilizați datele mobile în timpul instalării? Activarea datelor mobile poate fi supusă tarifelor de date.</string>
  <string name="no">Nu</string>
  <string name="yes">Da</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
  <string name="emergency_call">Apel de urgenţă</string>
-  <string name="setup_services">Facilități Cyanogen</string>
-  <string name="services_explanation" product="tablet">Aceste servicii extind capacitățile tabletei dumneavoastră. Datele vor fi folosite în conformitate cu Cyanogen <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-  <string name="services_explanation" product="default">Aceste servicii extind capacitățile telefonului dumneavoastră. Datele vor fi folosite în conformitate cu Cyanogen <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="services_privacy_policy">Politica de confidențialitate</string>
-  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g> prin trimiterea automată de date de diagnostic și de utilizare către Cyanogen. Aceste informații nu pot fi folosite pentru a vă identifica și ajută echipele ce lucrează la lucruri precum viața bateriei, performanța aplicațiilor și caracteristici noi <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> activând pictograme, imagini de fundal, și fonturi unice.</string>
-  <string name="services_use_secure_sms">Utilizează SMS securizat</string>
 </resources>
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -65,4 +65,9 @@
  <string name="services_os_nav_keys_label"><b>Использовать наэкранные навигационные кнопки</b> вместо аппаратных.</string>
  <string name="services_use_secure_sms">Использовать безопасные SMS</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g> для шифрования SMS с другими пользователями, использующими безопасные SMS на устройстве <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
+  <string name="setup_unlock">Разблокировать</string>
+  <string name="setup_device_locked">Устройство было заблокировано пользователем.</string>
+  <string name="setup_require_cyanogen_label"><b>Требовать пароль аккаунта ОС Cyanogen</b> для использования устройства даже после удаления всех данных.</string>
+  <string name="setup_device_locked_instructions"><i>Чтобы включить или отключить эту функцию, перейдите в меню «Настройки &gt; Безопасность»</i></string>
+  <string name="setup_warning_skip_anyway">Без учетной записи Cyanogen вы не сможете:\n\nПерсонализировать телефон новыми обоями, иконками и другими компонентами в приложении «Темы»\n\nНайти или удалённо сбросить настройки на телефоне в случае его потери</string>
 </resources>
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -65,4 +65,9 @@
  <string name="services_os_nav_keys_label"><b>Používajte navigačné tlačidlá na obrazovke</b> namiesto hardvérových tlačidiel.</string>
  <string name="services_use_secure_sms">Používajte zabezpečené SMS</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g> pre šifrovanie SMS konverzácií s ostatnými používateľmi prostredníctvom zabezpečených SMS na zariadení s <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
+  <string name="setup_unlock">Odomknúť</string>
+  <string name="setup_device_locked">Toto zariadenie bolo uzamknuté používateľom.</string>
+  <string name="setup_require_cyanogen_label"><b>Vyžadovať heslo vášho účtu Cyanogen OS</b> na použitie vášho zariadenia aj po obnove továrenských nastavení.</string>
+  <string name="setup_device_locked_instructions"><i>Na vypnutie/zapnutie tejto funkcie prejdite do Nastavenia &gt; Zabezpečenie</i></string>
+  <string name="setup_warning_skip_anyway">Bez účtu Cyanogen OS nebudete môcť:\n\nPrispôsobiť si telefón s novými ikonami, tapetami a ďalším obsahom z aplikácie Témy\n\nNájsť alebo vzdialene vymazať váš telefón po jeho strate</string>
 </resources>
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-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.
-->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Čarovnik za namestitev</string>
-  <string name="next">Naprej</string>
-  <string name="skip">Preskoči</string>
-  <string name="start">Začni</string>
-  <string name="ok">V redu</string>
-  <string name="loading">Samo trenutek \u2026</string>
-  <string name="setup_complete">Namestitev je končana</string>
-  <string name="setup_welcome">Dobrodošli</string>
-  <string name="setup_wifi">Izberite Wi-Fi</string>
-  <string name="setup_sim_missing">Kartica SIM ni prisotna</string>
-  <string name="setup_choose_data_sim">Izberite kartico SIM za podatke</string>
-  <string name="setup_location">Lokacijske storitve</string>
-  <string name="setup_other">Druge storitve</string>
-  <string name="setup_datetime">Datum in čas</string>
-  <string name="setup_current_date">Trenutni datum</string>
-  <string name="setup_current_time">Trenutni čas</string>
-  <string name="sim_missing_summary" product="tablet">V vaši tablici ni bila zaznana kartica SIM. Za vstavitev kartice SIM preberite navodila priložena k napravi.</string>
-  <string name="sim_missing_summary" product="default">V vašem telefonu ni bila zaznana kartica SIM. Za vstavitev kartice SIM preberite navodila priložena k napravi.</string>
-  <string name="choose_data_sim_summary" product="tablet">Katero kartico SIM želite uporabiti za podatke? Izbrana kartica SIM lahko povzroči omrežne stroške, ker bo uporabljena za namestitev vaše tablice.</string>
-  <string name="choose_data_sim_summary" product="default">Katero kartico SIM želite uporabiti za podatke? Izbrana kartica SIM lahko povzroči omrežne stroške, ker bo uporabljena za namestitev vašega telefona.</string>
-  <string name="date_time_summary">Nastavite časovni pas in prilagodite trenutni datum in čas, če je potrebno</string>
-  <string name="backup_data_summary"><b>Varnostno kopirajte</b> podatke programov, gesla Wi-Fi in druge nastavitve na strežnike Google</string>
-  <string name="other_services_summary">Te storitve obremenijo Google in lahko jih vklopite ali izklopite kadarkoli. Podatki se bodo uporabljali v skladu s Googlovo<xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-  <string name="location_services_summary">Lokacijske storitve omogočajo sistemu in programom tretjih oseb, da zbirajo in uporabijo podatke, kot je vaša približna lokacija. Program lahko na primer uporabi približno lokacijo za iskanje bližnjih kavarn.</string>
-  <string name="location_access_summary"><b>Dovolite programom, ki so zahtevale vaše dovoljenje</b>, da uporabijo podatke o vaši lokaciji. To lahko vključuje vašo trenutno lokacijo in prejšnje.</string>
-  <string name="location_gps" product="tablet"><b>Izboljšajte natančnost lokacije</b>, da omogočite programom uporabo GPS-a na vaši tablici.</string>
-  <string name="location_gps" product="default"><b>Izboljšajte natančnost lokacije</b>, da omogočite programom uporabo GPS-a v vašem telefonu.</string>
-  <string name="location_network"><b>Uporabite Wi-Fi</b>, da pomagate programom določiti vašo lokacijo.</string>
-  <string name="location_network_telephony"><b>Uporabite Wi-Fi in mobilna omrežja</b>, da pomagate programom določiti vašo lokacijo.</string>
-  <string name="location_network_gms"><b>Uporabite Googlove lokacijske storitve</b>, da pomagate programom določiti vašo lokacijo. To pomeni pošiljanje anonimnih podatkov o lokaciji Googlu tudi, ko se ne izvaja noben program.</string>
-  <string name="setup_mobile_data">Vključi mobilne podatke</string>
-  <string name="setup_mobile_data_no_service">Ni storitve</string>
-  <string name="setup_mobile_data_emergency_only">Samo klici v sili</string>
-  <string name="enable_mobile_data_summary">Ali želite med namestitvijo uporabiti mobilne podatke? Vklop mobilnih podatkov lahko povzroči dodatne stroške.</string>
-  <string name="no">Ne</string>
-  <string name="yes">Da</string>
-  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
-  <string name="emergency_call">Klic v sili</string>
-  <string name="setup_services">Funkcije Cyanogen</string>
-  <string name="services_explanation" product="tablet">Te storitve delajo za vas, da  razširijo zmogljivost vaše tablice. Podatki se uporabijo v skladu s <xliff:g id="name" example="Privacy Policy">%s </xliff:g> Cyanogen.</string>
-  <string name="services_explanation" product="default">Te storitve delajo za vas, da  razširijo zmogljivost vašega telefona. Podatki se uporabijo v skladu s <xliff:g id="name" example="Privacy Policy">%s </xliff:g> Cyanogen.</string>
-  <string name="services_privacy_policy">Politiko zasebnosti</string>
-  <string name="services_help_improve_cm">Pomagajte izboljšati <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
-  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g> s samodejnim pošiljanjem diagnostičnih podatkov in podatkov uporabe Cyanogenu. Ti podatki se ne smejo uporabljati za vaše prepoznavanje in ekipi pomagajo pri izboljšanju npr. življenjske dobe baterije, zmogljivosti programov in novih funkcij <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
-  <string name="services_apply_theme">Uveljavi temo <xliff:g id="name" example="Material">%s</xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g>, ki omogoča edinstvene ikone, slike ozadja in pisave.</string>
-  <string name="services_os_nav_keys_label"><b>Uporabite zaslonske tipke za krmarjenje</b> namesto fizičnih tipk.</string>
-  <string name="services_use_secure_sms">Uporabite varne SMS-e</string>
-  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g>, da šifrirate pogovore SMS z drugimi uporabniki z uporabo varnih SMS-ov na napravi <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
-</resources>
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -65,4 +65,9 @@
  <string name="services_os_nav_keys_label"><b>Користите навигационе тастере на екрану</b> уместо хардверских тастера.</string>
  <string name="services_use_secure_sms">Користи безбедан SMS</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g> да заштитиш SMS преписку са другим корисницима користећи безбедан SMS на <xliff:g id="name" example="CyanogenMod">%s</xliff:g> уређају.</string>
+  <string name="setup_unlock">Откључај</string>
+  <string name="setup_device_locked">Овај уређај је закључао корисник.</string>
+  <string name="setup_require_cyanogen_label"><b>Захтева твоју лозинку Cyanogen налога</b> да би користио свој уређај чак и после ресетовања на фабрички.</string>
+  <string name="setup_device_locked_instructions"><i>Да би искључио/укључио ово, иди на Подешавања &gt; Приватност</i></string>
+  <string name="setup_warning_skip_anyway">Без Cyanogen налога, нећеш моћи да:\n\nПрилагодиш телефон са новим иконама, тапетама и осталим у апликацији тема\n\nЛоцираш или обришеш телефон на даљину ако га изгубиш</string>
 </resources>
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -21,48 +21,18 @@
  <string name="skip">Hoppa över</string>
  <string name="start">Start</string>
  <string name="ok">OK</string>
-  <string name="loading">Vänta en liten stund\u2026</string>
-  <string name="setup_complete">Konfigurationen är klar</string>
  <string name="setup_welcome">Välkommen</string>
  <string name="setup_wifi">Välj Wi-Fi</string>
  <string name="setup_sim_missing">SIM-kort saknas</string>
-  <string name="setup_choose_data_sim">Välj ett SIM-kort för data</string>
  <string name="setup_location">Platstjänster</string>
  <string name="setup_other">Andra tjänster</string>
  <string name="setup_datetime">Datum &amp; tid</string>
  <string name="setup_current_date">Aktuellt datum</string>
  <string name="setup_current_time">Aktuell tid</string>
-  <string name="sim_missing_summary" product="tablet">Ett SIM-kort kunde inte hittas på din surfplatta. För att sätta in ett SIM-kort, läs instruktionerna som kom med din enhet.</string>
-  <string name="sim_missing_summary" product="default">Ett SIM-kort kunde inte hittas på din telefon. För att sätta in ett SIM-kort, läs instruktionerna som kom med din enhet.</string>
-  <string name="choose_data_sim_summary" product="tablet">Vilket SIM-kort vill du använda för data? Det valda SIM-kortet kan medföra nätverkskostnader eftersom det används för att konfigurera din enhet.</string>
-  <string name="choose_data_sim_summary" product="default">Vilket SIM-kort vill du använda för data? Det valda SIM-kortet kan medföra nätverkskostnader eftersom det används för att konfigurera din telefon.</string>
-  <string name="date_time_summary">Ställ in din tidszon och justera datum och tid om det behövs</string>
-  <string name="backup_data_summary"><b>Backa upp</b> appdata, Wi-Fi-lösenord, och andra inställningar på Google-servrar</string>
-  <string name="other_services_summary">Dessa tjänster låter Google arbeta för dig, och du kan sätta på eller stänga av tjänsterna när som helst. Data kommer användas i överensstämmelse med Googles <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-  <string name="location_services_summary">Platstjänster låter systemet och tredjepartsappar samla in och använda data såsom din ungefärliga plats. Till exempel så kan en app använda din ungefärliga plats för att hitta närbelägna kaféer.</string>
-  <string name="location_access_summary"><b>Tillåt appar som du gett tillåtelse</b> att använda din platsinformation. Detta inkluderar din nuvarande plats och tidigare platser.</string>
-  <string name="location_gps" product="tablet"><b>Förbättra platsnogrannhet</b> genom att tillåta appar att använda GPS:en på din surfplatta.</string>
-  <string name="location_gps" product="default"><b>Förbättra platsnogrannhet</b> genom att tillåta appar att använda GPS:en på din telefon.</string>
-  <string name="location_network"><b>Använd Wi-Fi</b> för att hjälpa appar fastställa din position.</string>
-  <string name="location_network_telephony"><b>Använd Wi-Fi och mobila nät</b> för att hjälpa appar fastställa din position.</string>
-  <string name="location_network_gms"><b>Använd Googles platstjänster</b> för att hjälpa appar fastställa din position. Detta innebär att skicka anonyma platsdata till Google, även om inga appar körs.</string>
-  <string name="setup_mobile_data">Aktivera mobildata</string>
  <string name="setup_mobile_data_no_service">Ingen service</string>
  <string name="setup_mobile_data_emergency_only">Endast nödsamtal</string>
-  <string name="enable_mobile_data_summary">Vill du använda mobildata under installationen? Aktivering av mobildata kan medföra datakostnader.</string>
  <string name="no">Nej</string>
  <string name="yes">Ja</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
  <string name="emergency_call">Nödsamtal</string>
-  <string name="setup_services">Cyanogen-funktioner</string>
-  <string name="services_explanation" product="tablet">Dessa tjänster ger dig fler användningsområden för din surfplatta. Datat kommer användas i överensstämmelse med Cyanogens <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-  <string name="services_explanation" product="default">Dessa tjänster ger dig fler användningsområden för din telefon. Datat kommer användas i överensstämmelse med Cyanogens <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-  <string name="services_privacy_policy">Sekretesspolicy</string>
-  <string name="services_help_improve_cm">Hjälp till att förbättra <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
-  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g> genom att automatiskt skicka diagnostisk och användningsdata till Cyanogen. Denna information kan inte användas för att identifiera dig och kan hjälpa team att arbeta på saker så som batteritid, app-prestanda, och nya<xliff:g id="name" example="CyanogenMod">%s</xliff:g> funktioner.</string>
-  <string name="services_apply_theme">Tillämpa temat <xliff:g id="name" example="Material">%s</xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> aktiverar unika ikoner, bakgrunder, och typsnitt.</string>
-  <string name="services_os_nav_keys_label"><b>Använder styrtangenter på skärmen</b> i stället för fysiska knappar.</string>
-  <string name="services_use_secure_sms">Använd säker SMS</string>
-  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g> för att kryptera SMS-konversationer med andra användare med hjälp av säkra SMS på en<xliff:g id="name" example="CyanogenMod">%s</xliff:g> enhet.</string>
 </resources>
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -65,4 +65,9 @@
  <string name="services_os_nav_keys_label"><b>ใช้แถบนำทาง</b> แทนการใช้ปุ่มบนอุปกรณ์</string>
  <string name="services_use_secure_sms">ใช้ SMS แบบเข้ารหัส</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g> จะเข้ารหัสข้อความเมื่อส่งข้อความไปหาผู้ที่ใช้อุปกรณ์ที่ติดตั้ง <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
+  <string name="setup_unlock">ปลดล็อก</string>
+  <string name="setup_device_locked">อุปกรณ์นี้ถูกล็อคโดยผู้ใช้</string>
+  <string name="setup_require_cyanogen_label"><b>กรุณาใส่รหัสผ่านบัญชี Cyanogen OS</b> แม้ว่าจะทำการคืนค่าโรงงานไปแล้วก็ตาม.</string>
+  <string name="setup_device_locked_instructions"><i>เพื่อปิด/เปิดความสามารถนี้ กรุณาไปที่ การตั้งค่า &gt; ความปลอดภัย</i></string>
+  <string name="setup_warning_skip_anyway">ถ้าหากไม่มีบัญชี Cyanogen OS แล้วคุณจะไม่สามารถ:\n\n ปรับเปลี่ยน ไอคอน,ภาพหน้าจอและอื่นๆผ่านแอปชุดรูปแบบ\n\nค้นหาและลบข้อมูลระยะไกลหากอุปกรณ์สูญหาย</string>
 </resources>
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -65,4 +65,9 @@
  <string name="services_os_nav_keys_label"><b>Donanımsal tuşlar yerine ekran üstü dolaşım tuşlarını kullanın.</b></string>
  <string name="services_use_secure_sms">Şifreli SMS kullanın</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="CyanogenMod">%s</xliff:g> cihazında diğer kullanıcılarla olan sohbetlerinizi şifrelemek için <xliff:g id="name" example="Use secure SMS">%s</xliff:g>.</string>
+  <string name="setup_unlock">Kilidi kaldır</string>
+  <string name="setup_device_locked">Bu cihaz kullanıcı tarafından kilitlenmiş.</string>
+  <string name="setup_require_cyanogen_label"><b>Cyanogen İS hesap şifresi gerekir</b> ki cihazınızı fabrika ayarlarına sıfırladıktan sonra kullanabilin.</string>
+  <string name="setup_device_locked_instructions"><i>Bu özelliği açıp kapatmak için, lütfen Ayarlar &gt; Güvenlik bölümüne gidin</i></string>
+  <string name="setup_warning_skip_anyway">Cyanogen İS Hesabı olmadan, aşağıdakiler mümkün olmayacaktır:\n\nTelefonunuzu yeni simgeler, duvar kağıtları ve Temalar uygulamasındaki daha fazla ögeyle özelleştirmek\n\nTelefonunuzu kaybedince uzaktan konumunu bulmak veya içeriğini silmek</string>
 </resources>
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -66,4 +66,9 @@
 </b> замість апаратних.</string>
  <string name="services_use_secure_sms">Використовувати безпечні SMS</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s </xliff:g> для шифрування SMS розмови з іншими користувачами за допомогою безпечної SMS на <xliff:g id="name" example="CyanogenMod"> %s </xliff:g> пристрої.</string>
+  <string name="setup_unlock">Розблокувати</string>
+  <string name="setup_device_locked">Цей пристрій заблоковано користувачем.</string>
+  <string name="setup_require_cyanogen_label"><b>Необхідний пароль Cyanogen OS</b> для використання Вашого пристрою навіть після скидання до заводських налаштувань.</string>
+  <string name="setup_device_locked_instructions"><i>Щоб увімкнути/вимкнути цю функцію, будь ласка, перейдіть до Налаштування &gt; Безпека</i></string>
+  <string name="setup_warning_skip_anyway">Без облікового запису ОС Cyanogen, Ви не зможете:\n\nДодати індивідуальності телефону за допомогою нових іконок, шпалер тощо у програмі \"Теми\",\n\nвиявити місцезнаходження пристрою  чи віддалено стерти дані, у випадку його втрати</string>
 </resources>
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -65,4 +65,9 @@
  <string name="services_os_nav_keys_label"><b>使用虚拟导航键</b>替代实体按键。</string>
  <string name="services_use_secure_sms">使用安全短信</string>
  <string name="services_secure_sms_label">在您的 <xliff:g id="name" example="CyanogenMod">%s</xliff:g> 设备上<xliff:g id="name" example="Use secure SMS">%s</xliff:g>来加密您与其他用户的短信会话。</string>
+  <string name="setup_unlock">解锁</string>
+  <string name="setup_device_locked">此设备的持有者锁定了该设备。</string>
+  <string name="setup_require_cyanogen_label">即使您的设备被恢复出厂设置，<b>也要求输入您的 Cyanogen OS 帐户密码</b>。</string>
+  <string name="setup_device_locked_instructions"><i>要开启或关闭此功能，请进入设置 &gt; 安全</i></string>
+  <string name="setup_warning_skip_anyway">“如果不创建 Cyanogen OS 帐户，您将：\n\n无法使用主题应用来使用新的图标、壁纸和其他内容来自定义您的手机\n\n无法定位或擦除遗失的手机”</string>
 </resources>
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -29,4 +29,5 @@
    <color name="header_bg">@color/primary</color>
    <color name="header_condensed_bg">@color/primary_dark</color>
    <color name="button_bar_background">#e4e7e8</color>
+    <color name="fingerprint_setup_text_color">#356bc4</color>
 </resources>
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -79,4 +79,19 @@
    <string name="services_os_nav_keys_label"><b>Use on screen navigation keys</b> instead of hardware keys.</string>
    <string name="services_use_secure_sms">Use secure SMS</string>
    <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g> to encrypt SMS conversations with other users using secure SMS on a <xliff:g id="name" example="CyanogenMod">%s</xliff:g> device.</string>
+
+    <string name="setup_unlock">Unlock</string>
+    <string name="setup_device_locked">This device has been locked by the user.</string>
+    <string name="setup_require_cyanogen_label"><b>Require your Cyanogen OS account password</b> in order to use your device even after a factory reset.</string>
+    <string name="setup_device_locked_instructions"><i>To turn this feature off/on, please go to Settings > Security</i></string>
+    <string name="setup_warning_skip_anyway">Without a Cyanogen OS Account, you won\'t be able to:\n\nCustomize your phone with new icons, wallpapers and more in the Themes app\n\nLocate or remotely erase your phone if it\'s lost</string>
+
+    <!-- Fingerprint setup -->
+    <string name="settings_fingerprint_setup_title">Select backup screen lock type</string>
+    <string name="settings_fingerprint_setup_details">How would you like to lock your screen?</string>
+    <string name="fingerprint_setup_title">Fingerprint setup</string>
+    <string name="fingerprint_setup_summary">To use your fingerprint sensor to unlock your screen or confirm purchases, you\'ll need to:</string>
+    <string name="fingerprint_setup_backup_lock_method">Setup a backup screen lock method</string>
+    <string name="fingerprint_setup_add_fingerprint">Add your fingerprint</string>
+    <string name="fingerprint_setup_screen_lock_setup">Setup screen lock</string>
 </resources>
--- a/src/com/cyanogenmod/setupwizard/SetupWizardApp.java
+++ b/src/com/cyanogenmod/setupwizard/SetupWizardApp.java
@@ -34,9 +34,13 @@ public class SetupWizardApp extends Application {

    public static final String ACTION_FINISHED = "com.cyanogenmod.setupwizard.SETUP_FINISHED";

+    public static final String ACCOUNT_TYPE_CYANOGEN = "com.cyanogen";
    public static final String ACCOUNT_TYPE_GMS = "com.google";

    public static final String ACTION_SETUP_WIFI = "com.android.net.wifi.SETUP_WIFI_NETWORK";
+    public static final String ACTION_VIEW_LEGAL = "cyanogenmod.intent.action.LEGALESE";
+
+    public static final String ACTION_SETUP_FINGERPRINT = "com.android.settings.SETUP_FINGERPRINT";

    public static final String EXTRA_FIRST_RUN = "firstRun";
    public static final String EXTRA_ALLOW_SKIP = "allowSkip";
@@ -45,8 +49,12 @@ public class SetupWizardApp extends Application {
    public static final String EXTRA_USE_IMMERSIVE = "useImmersiveMode";
    public static final String EXTRA_THEME = "theme";
    public static final String EXTRA_MATERIAL_LIGHT = "material_light";
+    public static final String EXTRA_CKSOP = "cksOp";
+    public static final String EXTRA_LOGIN_FOR_KILL_SWITCH = "authCks";
+    public static final String EXTRA_TITLE = "title";
+    public static final String EXTRA_DETAILS = "details";

-    private static final String KEY_DETECT_CAPTIVE_PORTAL = "captive_portal_detection_enabled";
+    public static final String KEY_DETECT_CAPTIVE_PORTAL = "captive_portal_detection_enabled";

    private static final String[] THEME_PACKAGES = {
            "org.cyanogenmod.theme.chooser",
@@ -59,11 +67,16 @@ public class SetupWizardApp extends Application {
    public static final int REQUEST_CODE_RESTORE_GMS= 2;
    public static final int REQUEST_CODE_SETUP_CYANOGEN= 3;
    public static final int REQUEST_CODE_SETUP_CAPTIVE_PORTAL= 4;
+    public static final int REQUEST_CODE_SETUP_BLUETOOTH= 5;
+    public static final int REQUEST_CODE_UNLOCK = 6;
+    public static final int REQUEST_CODE_SETUP_FINGERPRINT = 7;

    public static final int RADIO_READY_TIMEOUT = 10 * 1000;

    private boolean mIsRadioReady = false;

+    private boolean mIsAuthorized = false;
+
    private StatusBarManager mStatusBarManager;

    private final Handler mHandler = new Handler();
@@ -86,6 +99,9 @@ public class SetupWizardApp extends Application {
            if (!isOwner
                    || Settings.Secure.getInt(getContentResolver(),
                    Settings.Secure.USER_SETUP_COMPLETE) == 1) {
+                Settings.Global.putInt(getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 1);
+                Settings.Secure.putInt(getContentResolver(),
+                        Settings.Secure.USER_SETUP_COMPLETE, 1);
                SetupWizardUtils.disableGMSSetupWizard(this);
                SetupWizardUtils.disableSetupWizard(this);
                if (!isOwner) {
@@ -112,6 +128,14 @@ public class SetupWizardApp extends Application {
        mIsRadioReady = radioReady;
    }

+    public boolean isAuthorized() {
+        return mIsAuthorized;
+    }
+
+    public void setIsAuthorized(boolean isAuthorized) {
+        mIsAuthorized = isAuthorized;
+    }
+
    public void disableStatusBar() {
        mStatusBarManager.disable(StatusBarManager.DISABLE_EXPAND | StatusBarManager.DISABLE_NOTIFICATION_ALERTS
                | StatusBarManager.DISABLE_NOTIFICATION_TICKER | StatusBarManager.DISABLE_RECENT | StatusBarManager.DISABLE_HOME
--- a/src/com/cyanogenmod/setupwizard/cmstats/SetupStats.java
+++ b/src/com/cyanogenmod/setupwizard/cmstats/SetupStats.java
@@ -28,8 +28,8 @@ public class SetupStats {

    private static final String TAG = SetupStats.class.getSimpleName();

-    private static final String ANALYTIC_INTENT = "com.cyngn.cmstats.action.SEND_ANALYTIC_EVENT";
-    private static final String ANALYTIC_PERMISSION = "com.cyngn.cmstats.RECEIVE_ANALYTICS";
+    private static final String ANALYTIC_INTENT = "com.cyngn.stats.action.SEND_ANALYTIC_EVENT";
+    private static final String ANALYTIC_PERMISSION = "com.cyngn.stats.SEND_ANALYTICS";

    public static final String TRACKING_ID = "tracking_id";

@@ -146,6 +146,7 @@ public class SetupStats {
        public static final String LOCALE = "local";
        public static final String RESULT = "result";
        public static final String WIFI_SETUP = "wifi_setup";
+        public static final String BLUETOOTH_SETUP = "bluetooth_setup";
        public static final String CYANOGEN_ACCOUNT = "cyanogen_account_setup";
        public static final String CAPTIVE_PORTAL_LOGIN = "captive_portal_login";
        public static final String EMERGENCY_CALL = "emergency_call";
@@ -155,6 +156,7 @@ public class SetupStats {
        public static final String VALUE = "value";
        public static final String SLOT = "slot";
        public static final String TOTAL_TIME = "total_time";
+        public static final String FINGERPRINT_SETUP = "fingerprint_setup";
    }

 }
--- a/src/com/cyanogenmod/setupwizard/cmstats/StatsUtils.java
+++ b/src/com/cyanogenmod/setupwizard/cmstats/StatsUtils.java
@@ -18,12 +18,13 @@
 package com.cyanogenmod.setupwizard.cmstats;

 import android.content.Context;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.provider.Settings;

 public class StatsUtils {
-    private static final String STATS_PACKAGE = "com.cyngn.cmstats";
+    private static final String STATS_PACKAGE = "com.cyngn.stats";

    public static boolean isStatsCollectionEnabled(Context context) {
        return Settings.Secure.getInt(context.getContentResolver(),
@@ -33,7 +34,8 @@ public class StatsUtils {
    public static boolean isStatsPackageInstalled(Context context) {
        try {
            PackageInfo pi = context.getPackageManager().getPackageInfo(STATS_PACKAGE, 0);
-            return pi.applicationInfo.enabled;
+            return pi.applicationInfo.enabled
+                    && ((pi.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0);
        } catch (PackageManager.NameNotFoundException e) {
            return false;
        }
--- a/src/com/cyanogenmod/setupwizard/setup/BluetoothSetupPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/BluetoothSetupPage.java
@@ -0,0 +1,120 @@
+/*
+ * 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.
+ */
+
+package com.cyanogenmod.setupwizard.setup;
+
+import android.app.Activity;
+import android.app.ActivityOptions;
+import android.app.FragmentManager;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.provider.Settings;
+import android.util.Log;
+
+import com.cyanogenmod.setupwizard.R;
+import com.cyanogenmod.setupwizard.SetupWizardApp;
+import com.cyanogenmod.setupwizard.cmstats.SetupStats;
+import com.cyanogenmod.setupwizard.ui.LoadingFragment;
+import com.cyanogenmod.setupwizard.ui.SetupPageFragment;
+import com.cyanogenmod.setupwizard.util.SetupWizardUtils;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+public class BluetoothSetupPage extends SetupPage {
+
+    public static final String TAG = "BluetoothSetupPage";
+
+    private static final String ACTION_CONNECT_INPUT =
+            "com.google.android.intent.action.CONNECT_INPUT";
+
+    private static final String INTENT_EXTRA_NO_INPUT_MODE = "no_input_mode";
+
+    private LoadingFragment mLoadingFragment;
+
+    public BluetoothSetupPage(Context context, SetupDataCallbacks callbacks) {
+        super(context, callbacks);
+    }
+
+    @Override
+    public SetupPageFragment getFragment(FragmentManager fragmentManager, int action) {
+        mLoadingFragment = (LoadingFragment)fragmentManager.findFragmentByTag(getKey());
+        if (mLoadingFragment == null) {
+            Bundle args = new Bundle();
+            args.putString(Page.KEY_PAGE_ARGUMENT, getKey());
+            args.putInt(Page.KEY_PAGE_ACTION, action);
+            mLoadingFragment = new LoadingFragment();
+            mLoadingFragment.setArguments(args);
+        }
+        return mLoadingFragment;
+    }
+
+    @Override
+    public int getNextButtonTitleResId() {
+        return R.string.skip;
+    }
+
+    @Override
+    public String getKey() {
+        return TAG;
+    }
+
+    @Override
+    public int getTitleResId() {
+        return R.string.loading;
+    }
+
+
+    @Override
+    public void doLoadAction(FragmentManager fragmentManager, int action) {
+        super.doLoadAction(fragmentManager, action);
+        launchConnectInput();
+    }
+
+    @Override
+    public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == SetupWizardApp.REQUEST_CODE_SETUP_BLUETOOTH) {
+            SetupStats.addEvent(SetupStats.Categories.EXTERNAL_PAGE_LOAD,
+                    SetupStats.Action.EXTERNAL_PAGE_RESULT,
+                    SetupStats.Label.BLUETOOTH_SETUP, "success");
+            getCallbacks().onNextPage();
+        }  else {
+            return false;
+        }
+        return true;
+    }
+
+    private void launchConnectInput() {
+        Intent intent = new Intent();
+        intent.setComponent(SetupWizardUtils.mTvAddAccessorySettingsActivity);
+        intent.setAction(ACTION_CONNECT_INPUT);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.putExtra(INTENT_EXTRA_NO_INPUT_MODE, true);
+        ActivityOptions options =
+                ActivityOptions.makeCustomAnimation(mContext,
+                        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.BLUETOOTH_SETUP);
+        mLoadingFragment.startActivityForResult(intent,
+                SetupWizardApp.REQUEST_CODE_SETUP_BLUETOOTH, options.toBundle());
+    }
+}
--- a/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java
+++ b/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java
@@ -20,15 +20,15 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.ConnectivityManager;
-import android.telephony.SubInfoRecord;
+import android.os.SystemProperties;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;

+import android.util.Log;
 import com.android.internal.telephony.TelephonyIntents;
 import com.cyanogenmod.setupwizard.util.SetupWizardUtils;

 import java.util.ArrayList;
-import java.util.List;

 public class CMSetupWizardData extends AbstractSetupData {

@@ -36,6 +36,8 @@ public class CMSetupWizardData extends AbstractSetupData {

    private boolean mTimeSet = false;
    private boolean mTimeZoneSet = false;
+    private boolean mMobileDataEnabled = SystemProperties
+            .getBoolean("ro.com.android.mobiledata", true);

    public CMSetupWizardData(Context context) {
        super(context);
@@ -44,7 +46,13 @@ public class CMSetupWizardData extends AbstractSetupData {
    @Override
    protected PageList onNewPageList() {
        ArrayList<Page> pages = new ArrayList<Page>();
+        if (SetupWizardUtils.hasLeanback(mContext)) {
+            pages.add(new BluetoothSetupPage(mContext, this));
+        }
        pages.add(new WelcomePage(mContext, this));
+        if (SetupWizardUtils.hasFingerprint(mContext) && SetupWizardUtils.isOwner()) {
+            pages.add(new FingerprintSetupPage(mContext, this));
+        }
        pages.add(new WifiSetupPage(mContext, this));
        if (SetupWizardUtils.hasTelephony(mContext)) {
            pages.add(new SimCardMissingPage(mContext, this)
@@ -56,12 +64,14 @@ public class CMSetupWizardData extends AbstractSetupData {
        }
        if (SetupWizardUtils.hasTelephony(mContext)) {
            pages.add(new MobileDataPage(mContext, this)
-                    .setHidden(!isSimInserted() || SetupWizardUtils.isMobileDataEnabled(mContext)));
+                    .setHidden(!isSimInserted() || mMobileDataEnabled));
        }
        if (SetupWizardUtils.hasGMS(mContext)) {
            pages.add(new GmsAccountPage(mContext, this).setHidden(true));
        }
-        pages.add(new CyanogenServicesPage(mContext, this).setHidden(true));
+        if (!SetupWizardUtils.hasLeanback(mContext)) {
+            pages.add(new CyanogenServicesPage(mContext, this).setHidden(true));
+        }
        pages.add(new CyanogenSettingsPage(mContext, this));
        pages.add(new OtherSettingsPage(mContext, this));
        pages.add(new DateTimePage(mContext, this));
@@ -80,6 +90,7 @@ public class CMSetupWizardData extends AbstractSetupData {
                .equals(ConnectivityManager.CONNECTIVITY_ACTION) ||
                intent.getAction()
                        .equals(ConnectivityManager.CONNECTIVITY_ACTION_IMMEDIATE)) {
+            showHideMobileDataPage();
            showHideAccountPages();
        } else  if (intent.getAction()
                .equals(TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED)) {
@@ -133,7 +144,7 @@ public class CMSetupWizardData extends AbstractSetupData {
        MobileDataPage mobileDataPage =
                (MobileDataPage) getPage(MobileDataPage.TAG);
        if (mobileDataPage != null) {
-            mobileDataPage.setHidden(!isSimInserted());
+            mobileDataPage.setHidden(!isSimInserted() || mMobileDataEnabled);
        }
    }

@@ -164,7 +175,13 @@ public class CMSetupWizardData extends AbstractSetupData {
        TelephonyManager tm = TelephonyManager.from(mContext);
        int simSlotCount = tm.getSimCount();
        for (int i = 0; i < simSlotCount; i++) {
-            int state = tm.getSimState(i);
+            int state;
+            try {
+                state = tm.getSimState(i);
+            } catch (IllegalStateException ise) {
+                Log.e(TAG, "Unable to get sim state from TelephonyManager");
+                continue;
+            }
            if (state != TelephonyManager.SIM_STATE_ABSENT
                    && state != TelephonyManager.SIM_STATE_UNKNOWN) {
                 return true;
@@ -177,14 +194,13 @@ public class CMSetupWizardData extends AbstractSetupData {
    private boolean allSimsInserted() {
        TelephonyManager tm = TelephonyManager.from(mContext);
        int simSlotCount = tm.getSimCount();
-        List<SubInfoRecord> subInfoRecords =  SubscriptionManager.getActiveSubInfoList();
        for (int i = 0; i < simSlotCount; i++) {
            int state = tm.getSimState(i);
            if (state == TelephonyManager.SIM_STATE_ABSENT) {
                return false;
            }
        }
-        return simSlotCount == subInfoRecords.size();
+        return simSlotCount == SubscriptionManager.from(mContext).getActiveSubscriptionInfoCount();
    }

-}
+}
--- a/src/com/cyanogenmod/setupwizard/setup/ChooseDataSimPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/ChooseDataSimPage.java
@@ -24,7 +24,7 @@ import android.os.Handler;
 import android.telephony.PhoneStateListener;
 import android.telephony.ServiceState;
 import android.telephony.SignalStrength;
-import android.telephony.SubInfoRecord;
+import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
@@ -87,7 +87,7 @@ public class ChooseDataSimPage extends SetupPage {
        private SparseArray<CheckBox> mCheckBoxes;

        private TelephonyManager mPhone;
-        private SparseArray<SubInfoRecord> mSubInfoRecords;
+        private SparseArray<SubscriptionInfo> mSubInfoRecords;
        private SparseArray<SignalStrength> mSignalStrengths;
        private SparseArray<ServiceState> mServiceStates;
        private SparseArray<PhoneStateListener> mPhoneStateListeners;
@@ -95,6 +95,7 @@ public class ChooseDataSimPage extends SetupPage {
        private boolean mIsAttached = false;

        private Context mContext;
+        private SubscriptionManager mSubscriptionManager;

        private final Handler mHandler = new Handler();

@@ -108,9 +109,9 @@ public class ChooseDataSimPage extends SetupPage {
        private View.OnClickListener mSetDataSimClickListener = new View.OnClickListener() {
            @Override
            public void onClick(View view) {
-                SubInfoRecord subInfoRecord = (SubInfoRecord)view.getTag();
+                SubscriptionInfo subInfoRecord = (SubscriptionInfo)view.getTag();
                if (subInfoRecord != null) {
-                    SubscriptionManager.setDefaultDataSubId(subInfoRecord.subId);
+                    mSubscriptionManager.setDefaultDataSubId(subInfoRecord.getSubscriptionId());
                    setDataSubChecked(subInfoRecord);
                }
            }
@@ -120,11 +121,12 @@ public class ChooseDataSimPage extends SetupPage {
        protected void initializePage() {
            mPageView = (ViewGroup)mRootView.findViewById(R.id.page_view);
            mProgressBar = (ProgressBar) mRootView.findViewById(R.id.progress);
-            List<SubInfoRecord> subInfoRecords =  SubscriptionManager.getActiveSubInfoList();
-            int simCount = subInfoRecords.size();
-            mSubInfoRecords = new SparseArray<SubInfoRecord>(simCount);
-            for (SubInfoRecord subInfoRecord : subInfoRecords) {
-                mSubInfoRecords.put(subInfoRecord.slotId, subInfoRecord);
+            List<SubscriptionInfo> subInfoRecords = mSubscriptionManager.getActiveSubscriptionInfoList();
+            int simCount =
+                    subInfoRecords != null ? subInfoRecords.size() : 0;
+            mSubInfoRecords = new SparseArray<SubscriptionInfo>(simCount);
+            for (SubscriptionInfo subInfoRecord : subInfoRecords) {
+                mSubInfoRecords.put(subInfoRecord.getSimSlotIndex(), subInfoRecord);
            }
            mNameViews = new SparseArray<TextView>(simCount);
            mSignalViews = new SparseArray<ImageView>(simCount);
@@ -136,17 +138,14 @@ public class ChooseDataSimPage extends SetupPage {
            for (int i = 0; i < simCount; i++) {
                View simRow = inflater.inflate(R.layout.data_sim_row, null);
                mPageView.addView(simRow);
-                SubInfoRecord subInfoRecord = mSubInfoRecords.valueAt(i);
+                SubscriptionInfo subInfoRecord = mSubInfoRecords.valueAt(i);
                simRow.setTag(subInfoRecord);
                simRow.setOnClickListener(mSetDataSimClickListener);
-                mNameViews.put(subInfoRecord.slotId,
-                        (TextView) simRow.findViewById(R.id.sim_title));
-                mSignalViews.put(subInfoRecord.slotId,
-                        (ImageView) simRow.findViewById(R.id.signal));
-                mCheckBoxes.put(subInfoRecord.slotId,
-                        (CheckBox) simRow.findViewById(R.id.enable_check));
-                mPhoneStateListeners.put(subInfoRecord.slotId,
-                        createPhoneStateListener(subInfoRecord));
+                int slot = subInfoRecord.getSimSlotIndex();
+                mNameViews.put(slot, (TextView) simRow.findViewById(R.id.sim_title));
+                mSignalViews.put(slot, (ImageView) simRow.findViewById(R.id.signal));
+                mCheckBoxes.put(slot, (CheckBox) simRow.findViewById(R.id.enable_check));
+                mPhoneStateListeners.put(slot, createPhoneStateListener(subInfoRecord));
                mPageView.addView(inflater.inflate(R.layout.divider, null));
            }
            updateSignalStrengths();
@@ -158,11 +157,17 @@ public class ChooseDataSimPage extends SetupPage {
            return R.layout.choose_data_sim_page;
        }

+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            mContext = getActivity().getApplicationContext();
+            mSubscriptionManager = SubscriptionManager.from(mContext);
+        }
+
        @Override
        public void onResume() {
            super.onResume();
            mIsAttached = true;
-            mContext = getActivity().getApplicationContext();
            mPhone = (TelephonyManager)getActivity().getSystemService(Context.TELEPHONY_SERVICE);
            for (int i = 0; i < mPhoneStateListeners.size(); i++) {
                mPhone.listen(mPhoneStateListeners.valueAt(i),
@@ -188,14 +193,13 @@ public class ChooseDataSimPage extends SetupPage {
            }
        }

-        private PhoneStateListener createPhoneStateListener(final SubInfoRecord subInfoRecord) {
-            return new PhoneStateListener(subInfoRecord.subId) {
+        private PhoneStateListener createPhoneStateListener(final SubscriptionInfo subInfoRecord) {
+            return new PhoneStateListener(subInfoRecord.getSubscriptionId()) {

                @Override
                public void onSignalStrengthsChanged(SignalStrength signalStrength) {
-                        mSignalStrengths.put(subInfoRecord.slotId, signalStrength);
-                        updateSignalStrength(subInfoRecord);
-
+                    mSignalStrengths.put(subInfoRecord.getSimSlotIndex(), signalStrength);
+                    updateSignalStrength(subInfoRecord);
                }

                @Override
@@ -203,7 +207,7 @@ public class ChooseDataSimPage extends SetupPage {
                    if (SetupWizardUtils.isRadioReady(mContext, state)) {
                        hideWaitForRadio();
                    }
-                    mServiceStates.put(subInfoRecord.slotId, state);
+                    mServiceStates.put(subInfoRecord.getSimSlotIndex(), state);
                    updateSignalStrength(subInfoRecord);
                }
            };
@@ -230,14 +234,14 @@ public class ChooseDataSimPage extends SetupPage {
            }
        }

-        private void setDataSubChecked(SubInfoRecord subInfoRecord) {
+        private void setDataSubChecked(SubscriptionInfo subInfoRecord) {
            if (mIsAttached) {
                for (int i = 0; i < mCheckBoxes.size(); i++) {
-                    if (subInfoRecord.slotId == i) {
-                        mCheckBoxes.get(subInfoRecord.slotId).setChecked(true);
+                    if (subInfoRecord.getSimSlotIndex() == i) {
+                        mCheckBoxes.get(i).setChecked(true);
                        SetupStats.addEvent(SetupStats.Categories.SETTING_CHANGED,
                                SetupStats.Action.PREFERRED_DATA_SIM,
-                                SetupStats.Label.SLOT, String.valueOf(subInfoRecord.slotId + 1));
+                                SetupStats.Label.SLOT, String.valueOf(i + 1));
                    } else {
                        mCheckBoxes.get(i).setChecked(false);
                    }
@@ -249,19 +253,17 @@ public class ChooseDataSimPage extends SetupPage {
        private void updateCurrentDataSub() {
            if (mIsAttached) {
                for (int i = 0; i < mSubInfoRecords.size(); i++) {
-                    SubInfoRecord subInfoRecord = mSubInfoRecords.valueAt(i);
-                    final long defaultDataSubId =  SubscriptionManager.getDefaultDataSubId();
-                    mCheckBoxes.get(subInfoRecord.slotId)
-                            .setChecked(defaultDataSubId == subInfoRecord.subId);
-
+                    SubscriptionInfo subInfoRecord = mSubInfoRecords.valueAt(i);
+                    mCheckBoxes.get(i).setChecked(mSubscriptionManager.getDefaultDataPhoneId()
+                            == subInfoRecord.getSimSlotIndex());
                }
            }
        }

-        private void updateCarrierText(SubInfoRecord subInfoRecord) {
+        private void updateCarrierText(SubscriptionInfo subInfoRecord) {
            if (mIsAttached) {
-                String name = mPhone.getNetworkOperatorName(subInfoRecord.subId);
-                ServiceState serviceState = mServiceStates.get(subInfoRecord.slotId);
+                String name = mPhone.getNetworkOperatorName(subInfoRecord.getSubscriptionId());
+                ServiceState serviceState = mServiceStates.get(subInfoRecord.getSimSlotIndex());
                if (TextUtils.isEmpty(name)) {
                    if (serviceState != null && serviceState.isEmergencyOnly()) {
                        name = getString(R.string.setup_mobile_data_emergency_only);
@@ -270,15 +272,16 @@ public class ChooseDataSimPage extends SetupPage {
                    }
                }
                String formattedName =
-                        getString(R.string.data_sim_name, subInfoRecord.slotId + 1, name);
-                mNameViews.get(subInfoRecord.slotId).setText(formattedName);
+                        getString(R.string.data_sim_name,
+                                  subInfoRecord.getSimSlotIndex() + 1, name);
+                mNameViews.get(subInfoRecord.getSimSlotIndex()).setText(formattedName);
            }
        }

-        private void updateSignalStrength(SubInfoRecord subInfoRecord) {
+        private void updateSignalStrength(SubscriptionInfo subInfoRecord) {
            if (mIsAttached) {
-                ImageView signalView = mSignalViews.get(subInfoRecord.slotId);
-                SignalStrength signalStrength = mSignalStrengths.get(subInfoRecord.slotId);
+                ImageView signalView = mSignalViews.get(subInfoRecord.getSimSlotIndex());
+                SignalStrength signalStrength = mSignalStrengths.get(subInfoRecord.getSimSlotIndex());
                if (!hasService(subInfoRecord)) {
                    signalView.setImageResource(R.drawable.ic_signal_no_signal);
                } else {
@@ -308,9 +311,9 @@ public class ChooseDataSimPage extends SetupPage {
            }
        }

-        private boolean hasService(SubInfoRecord subInfoRecord) {
+        private boolean hasService(SubscriptionInfo subInfoRecord) {
            boolean retVal;
-            ServiceState serviceState = mServiceStates.get(subInfoRecord.slotId);
+            ServiceState serviceState = mServiceStates.get(subInfoRecord.getSimSlotIndex());
            if (serviceState != null) {
                // Consider the device to be in service if either voice or data service is available.
                // Some SIM cards are marketed as data-only and do not support voice service, and on
--- a/src/com/cyanogenmod/setupwizard/setup/CyanogenServicesPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/CyanogenServicesPage.java
@@ -101,6 +101,9 @@ public class CyanogenServicesPage extends SetupPage {
                        resultCode == Activity.RESULT_OK ? "success" : "skipped");
                if (SetupWizardUtils.accountExists(mContext,
                        mContext.getString(R.string.cm_account_type))) {
+                    if (SetupWizardUtils.isDeviceLocked()) {
+                        ((SetupWizardApp) mContext.getApplicationContext()).setIsAuthorized(true);
+                    }
                    setHidden(true);
                }
                getCallbacks().onNextPage();
--- a/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java
@@ -18,12 +18,17 @@ package com.cyanogenmod.setupwizard.setup;

 import android.app.Fragment;
 import android.app.FragmentManager;
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.content.pm.ThemeUtils;
 import android.content.res.ThemeConfig;
 import android.content.res.ThemeManager;
 import android.hardware.CmHardwareManager;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.preference.PreferenceManager;
@@ -39,9 +44,11 @@ import android.view.IWindowManager;
 import android.view.View;
 import android.view.WindowManagerGlobal;
 import android.widget.CheckBox;
+import android.widget.ImageView;
 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;
 import com.cyanogenmod.setupwizard.ui.WebViewDialogFragment;
@@ -63,6 +70,8 @@ public class CyanogenSettingsPage extends SetupPage {
    public static final String SETTING_METRICS = "settings.cyanogen.allow_metrics";
    public static final String PRIVACY_POLICY_URI = "https://cyngn.com/oobe-legal?hideHeader=1";

+    private static final String WHISPERPUSH_PACKAGE = "org.whispersystems.whisperpush";
+
    public CyanogenSettingsPage(Context context, SetupDataCallbacks callbacks) {
        super(context, callbacks);
    }
@@ -197,6 +206,14 @@ public class CyanogenSettingsPage extends SetupPage {
    private static boolean hideWhisperPush(Context context) {
        final int playServicesAvailable = GooglePlayServicesUtil
                .isGooglePlayServicesAvailable(context);
+        try {
+            PackageInfo pi = context.getPackageManager().getPackageInfo(WHISPERPUSH_PACKAGE, 0);
+            if (pi == null) {
+                return true;
+            }
+        } catch (PackageManager.NameNotFoundException e) {
+            return true;
+        }
        return playServicesAvailable != ConnectionResult.SUCCESS
                || !SetupWizardUtils.hasTelephony(context)
                || (SetupWizardUtils.hasTelephony(context) &&
@@ -209,6 +226,9 @@ public class CyanogenSettingsPage extends SetupPage {

    public static class CyanogenSettingsFragment extends SetupPageFragment {

+        private View mKillSwitchView;
+        private TextView mKillSwitchTitle;
+        private ImageView mKillSwitchStatus;
        private View mMetricsRow;
        private View mDefaultThemeRow;
        private View mNavKeysRow;
@@ -267,9 +287,13 @@ public class CyanogenSettingsPage extends SetupPage {
            ClickableSpan clickableSpan = new ClickableSpan() {
                @Override
                public void onClick(View textView) {
-                    WebViewDialogFragment.newInstance()
-                            .setUri(PRIVACY_POLICY_URI)
-                            .show(getActivity().getFragmentManager(), WebViewDialogFragment.TAG);
+                    final Intent intent = new Intent(SetupWizardApp.ACTION_VIEW_LEGAL);
+                    intent.setData(Uri.parse(PRIVACY_POLICY_URI));
+                    try {
+                        getActivity().startActivity(intent);
+                    } catch (Exception e) {
+                        Log.e(TAG, "Unable to start activity " + intent.toString(), e);
+                    }
                }
            };
            ss.setSpan(clickableSpan,
@@ -279,6 +303,21 @@ public class CyanogenSettingsPage extends SetupPage {
            privacyPolicy.setMovementMethod(LinkMovementMethod.getInstance());
            privacyPolicy.setText(ss);

+            mKillSwitchView = mRootView.findViewById(R.id.killswitch);
+            mKillSwitchTitle = (TextView)mRootView.findViewById(R.id.killswitch_title);
+            mKillSwitchStatus = (ImageView)mRootView.findViewById(R.id.killswitch_check);
+            if (hideKillSwitch()) {
+                mKillSwitchView.setVisibility(View.GONE);
+            } else {
+                if (SetupWizardUtils.isDeviceLocked()) {
+                    mKillSwitchTitle.setEnabled(true);
+                    mKillSwitchStatus.setImageResource(R.drawable.tick);
+                } else {
+                    mKillSwitchTitle.setEnabled(false);
+                    mKillSwitchStatus.setImageResource(R.drawable.cross);
+                }
+            }
+
            mMetricsRow = mRootView.findViewById(R.id.metrics);
            mMetricsRow.setOnClickListener(mMetricsClickListener);
            String metricsHelpImproveCM =
@@ -410,5 +449,9 @@ public class CyanogenSettingsPage extends SetupPage {
            }
        }

+        private static boolean hideKillSwitch() {
+            return !SetupWizardUtils.hasKillSwitch();
+        }
+
    }
 }
--- a/src/com/cyanogenmod/setupwizard/setup/FingerprintSetupPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/FingerprintSetupPage.java
@@ -0,0 +1,123 @@
+/*
+ * 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.android.internal.widget.LockPatternUtils;
+import com.cyanogenmod.setupwizard.R;
+import com.cyanogenmod.setupwizard.SetupWizardApp;
+import com.cyanogenmod.setupwizard.cmstats.SetupStats;
+import com.cyanogenmod.setupwizard.ui.SetupPageFragment;
+
+public class FingerprintSetupPage extends SetupPage {
+
+    private static final String TAG = "FingerprintSetupPage";
+
+    public FingerprintSetupPage(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 FingerprintSetupFragment();
+            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.fingerprint_setup_title;
+    }
+
+    @Override
+    public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (SetupWizardApp.REQUEST_CODE_SETUP_FINGERPRINT == requestCode) {
+            if (resultCode == Activity.RESULT_OK) {
+                getCallbacks().onNextPage();
+            }
+        }
+        return true;
+    }
+
+    public static class FingerprintSetupFragment extends SetupPageFragment {
+
+        private TextView mSetupFingerprint;
+
+        @Override
+        protected void initializePage() {
+            mSetupFingerprint = (TextView) mRootView.findViewById(R.id.setup_fingerprint);
+            mSetupFingerprint.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    launchFingerprintSetup();
+                }
+            });
+        }
+
+        @Override
+        protected int getLayoutResource() {
+            return R.layout.setup_fingerprint;
+        }
+
+        private void launchFingerprintSetup() {
+            Intent intent = new Intent(SetupWizardApp.ACTION_SETUP_FINGERPRINT);
+            intent.putExtra(SetupWizardApp.EXTRA_FIRST_RUN, true);
+            intent.putExtra(SetupWizardApp.EXTRA_ALLOW_SKIP, true);
+            intent.putExtra(SetupWizardApp.EXTRA_USE_IMMERSIVE, true);
+            intent.putExtra(SetupWizardApp.EXTRA_THEME, SetupWizardApp.EXTRA_MATERIAL_LIGHT);
+            intent.putExtra(SetupWizardApp.EXTRA_AUTO_FINISH, false);
+            intent.putExtra(LockPatternUtils.LOCKSCREEN_FINGERPRINT_FALLBACK, true);
+            intent.putExtra(SetupWizardApp.EXTRA_TITLE,
+                    getString(R.string.settings_fingerprint_setup_title));
+            intent.putExtra(SetupWizardApp.EXTRA_DETAILS,
+                    getString(R.string.settings_fingerprint_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.FINGERPRINT_SETUP);
+            startActivityForResult(intent, SetupWizardApp.REQUEST_CODE_SETUP_FINGERPRINT,
+                    options.toBundle());
+        }
+    }
+}
--- a/src/com/cyanogenmod/setupwizard/setup/FinishSetupReceiver.java
+++ b/src/com/cyanogenmod/setupwizard/setup/FinishSetupReceiver.java
@@ -0,0 +1,29 @@
+package com.cyanogenmod.setupwizard.setup;
+
+import android.app.StatusBarManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.provider.Settings;
+
+import com.cyanogenmod.setupwizard.SetupWizardApp;
+import com.cyanogenmod.setupwizard.util.SetupWizardUtils;
+
+public class FinishSetupReceiver extends BroadcastReceiver {
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (SetupWizardUtils.isDeviceLocked()) {
+            return;
+        }
+        Settings.Global.putInt(context.getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 1);
+        Settings.Secure.putInt(context.getContentResolver(),
+                Settings.Secure.USER_SETUP_COMPLETE, 1);
+        ((StatusBarManager)context.getSystemService(Context.STATUS_BAR_SERVICE)).disable(
+                StatusBarManager.DISABLE_NONE);
+        Settings.Global.putInt(context.getContentResolver(),
+                SetupWizardApp.KEY_DETECT_CAPTIVE_PORTAL, 1);
+        SetupWizardUtils.disableGMSSetupWizard(context);
+        SetupWizardUtils.disableSetupWizard(context);
+    }
+}
--- a/src/com/cyanogenmod/setupwizard/setup/OtherSettingsPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/OtherSettingsPage.java
@@ -19,11 +19,14 @@ package com.cyanogenmod.setupwizard.setup;
 import android.app.Fragment;
 import android.app.FragmentManager;
 import android.app.backup.IBackupManager;
+import android.content.ComponentName;
 import android.content.ContentQueryMap;
 import android.content.ContentResolver;
 import android.content.Context;
+import android.content.Intent;
 import android.database.Cursor;
 import android.location.LocationManager;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.os.ServiceManager;
@@ -32,6 +35,7 @@ import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.method.LinkMovementMethod;
 import android.text.style.ClickableSpan;
+import android.util.Log;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.TextView;
@@ -151,10 +155,13 @@ public class OtherSettingsPage extends SetupPage {
                ClickableSpan clickableSpan = new ClickableSpan() {
                    @Override
                    public void onClick(View textView) {
-                        WebViewDialogFragment.newInstance()
-                                .setUri(PRIVACY_POLICY_URI)
-                                .show(getActivity().getFragmentManager(),
-                                        WebViewDialogFragment.TAG);
+                        final Intent intent = new Intent(SetupWizardApp.ACTION_VIEW_LEGAL);
+                        intent.setData(Uri.parse(PRIVACY_POLICY_URI));
+                        try {
+                            getActivity().startActivity(intent);
+                        } catch (Exception e) {
+                            Log.e(TAG, "Unable to start activity " + intent.toString());
+                        }
                    }
                };
                ss.setSpan(clickableSpan,
--- a/src/com/cyanogenmod/setupwizard/setup/WelcomePage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/WelcomePage.java
@@ -16,6 +16,10 @@

 package com.cyanogenmod.setupwizard.setup;

+import android.accounts.AccountManager;
+import android.accounts.AccountManagerCallback;
+import android.accounts.AccountManagerFuture;
+import android.app.Activity;
 import android.app.ActivityOptions;
 import android.app.Fragment;
 import android.app.FragmentManager;
@@ -25,14 +29,17 @@ import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.Handler;
+import android.util.Log;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.NumberPicker;

 import com.cyanogenmod.setupwizard.R;
+import com.cyanogenmod.setupwizard.SetupWizardApp;
 import com.cyanogenmod.setupwizard.cmstats.SetupStats;
 import com.cyanogenmod.setupwizard.ui.LocalePicker;
 import com.cyanogenmod.setupwizard.ui.SetupPageFragment;
+import com.cyanogenmod.setupwizard.util.SetupWizardUtils;

 import java.util.Locale;

@@ -42,21 +49,23 @@ public class WelcomePage extends SetupPage {

    private static final String ACTION_EMERGENCY_DIAL = "com.android.phone.EmergencyDialer.DIAL";

+    private WelcomeFragment mWelcomeFragment;
+
    public WelcomePage(Context context, SetupDataCallbacks callbacks) {
        super(context, callbacks);
    }

    @Override
    public Fragment getFragment(FragmentManager fragmentManager, int action) {
-        Fragment fragment = fragmentManager.findFragmentByTag(getKey());
-        if (fragment == null) {
+        mWelcomeFragment = (WelcomeFragment)fragmentManager.findFragmentByTag(getKey());
+        if (mWelcomeFragment == null) {
            Bundle args = new Bundle();
            args.putString(Page.KEY_PAGE_ARGUMENT, getKey());
            args.putInt(Page.KEY_PAGE_ACTION, action);
-            fragment = new WelcomeFragment();
-            fragment.setArguments(args);
+            mWelcomeFragment = new WelcomeFragment();
+            mWelcomeFragment.setArguments(args);
        }
-        return fragment;
+        return mWelcomeFragment;
    }

    @Override
@@ -64,6 +73,16 @@ public class WelcomePage extends SetupPage {
        return R.string.setup_welcome;
    }

+    @Override
+    public boolean doNextAction() {
+        if (isLocked()) {
+            confirmCyanogenCredentials(mWelcomeFragment);
+            return true;
+        } else {
+            return super.doNextAction();
+        }
+    }
+
    @Override
    public boolean doPreviousAction() {
        Intent intent = new Intent(ACTION_EMERGENCY_DIAL);
@@ -81,16 +100,66 @@ public class WelcomePage extends SetupPage {
        return true;
    }

+    @Override
+    public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == SetupWizardApp.REQUEST_CODE_UNLOCK) {
+            if (resultCode == Activity.RESULT_OK) {
+                ((SetupWizardApp) mContext.getApplicationContext()).setIsAuthorized(true);
+                getCallbacks().onNextPage();
+                return true;
+            }
+        }
+        return false;
+    }
+
    @Override
    public String getKey() {
        return TAG;
    }

+    @Override
+    public int getNextButtonTitleResId() {
+        if (isLocked()) {
+            return R.string.setup_unlock;
+        } else {
+            return R.string.next;
+        }
+    }
+
    @Override
    public int getPrevButtonTitleResId() {
        return R.string.emergency_call;
    }

+    private void confirmCyanogenCredentials(final Fragment fragment) {
+        AccountManager accountManager = AccountManager.get(mContext);
+        accountManager.editProperties(SetupWizardApp.ACCOUNT_TYPE_CYANOGEN, null,
+                new AccountManagerCallback<Bundle>() {
+                    public void run(AccountManagerFuture<Bundle> f) {
+                        try {
+                            Bundle b = f.getResult();
+                            Intent i = b.getParcelable(AccountManager.KEY_INTENT);
+                            i.putExtra(SetupWizardApp.EXTRA_FIRST_RUN, true);
+                            i.putExtra(SetupWizardApp.EXTRA_SHOW_BUTTON_BAR, true);
+                            i.putExtra(SetupWizardApp.EXTRA_USE_IMMERSIVE, true);
+                            i.putExtra(SetupWizardApp.EXTRA_LOGIN_FOR_KILL_SWITCH, true);
+                            fragment.startActivityForResult(i,
+                                    SetupWizardApp.REQUEST_CODE_UNLOCK);
+                        } catch (Throwable t) {
+                            Log.e(getKey(), "confirmCredentials failed", t);
+                        }
+                    }
+                }, null);
+    }
+
+    private boolean isLocked() {
+        boolean isAuthorized = ((SetupWizardApp) mContext.getApplicationContext()).isAuthorized();
+        if (SetupWizardUtils.isDeviceLocked()) {
+            return !isAuthorized;
+        }
+        return false;
+    }
+
    public static class WelcomeFragment extends SetupPageFragment {

        private ArrayAdapter<com.android.internal.app.LocalePicker.LocaleInfo> mLocaleAdapter;
--- a/src/com/cyanogenmod/setupwizard/setup/WifiSetupPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/WifiSetupPage.java
@@ -222,6 +222,9 @@ public class WifiSetupPage extends SetupPage {
    private void launchWifiSetup() {
        SetupWizardUtils.tryEnablingWifi(mContext);
        Intent intent = new Intent(SetupWizardApp.ACTION_SETUP_WIFI);
+        if (SetupWizardUtils.hasLeanback(mContext)) {
+            intent.setComponent(SetupWizardUtils.mTvwifisettingsActivity);
+        }
        intent.putExtra(SetupWizardApp.EXTRA_FIRST_RUN, true);
        intent.putExtra(SetupWizardApp.EXTRA_ALLOW_SKIP, true);
        intent.putExtra(SetupWizardApp.EXTRA_USE_IMMERSIVE, true);
--- a/src/com/cyanogenmod/setupwizard/util/EnableAccessibilityController.java
+++ b/src/com/cyanogenmod/setupwizard/util/EnableAccessibilityController.java
@@ -91,6 +91,7 @@ public class EnableAccessibilityController {
    private final float mTouchSlop;

    private boolean mDestroyed;
+    private boolean mCanceled;

    private float mFirstPointerDownX;
    private float mFirstPointerDownY;
@@ -176,6 +177,12 @@ public class EnableAccessibilityController {
    public boolean onTouchEvent(MotionEvent event) {
        final int pointerCount = event.getPointerCount();
        final int action = event.getActionMasked();
+        if (mCanceled) {
+            if (action == MotionEvent.ACTION_UP) {
+                mCanceled = false;
+            }
+            return true;
+        }
        switch (action) {
            case MotionEvent.ACTION_POINTER_DOWN: {
                if (pointerCount > 2) {
@@ -211,6 +218,7 @@ public class EnableAccessibilityController {
    }

    private void cancel() {
+        mCanceled = true;
        if (mHandler.hasMessages(MESSAGE_SPEAK_WARNING)) {
            mHandler.removeMessages(MESSAGE_SPEAK_WARNING);
        } else if (mHandler.hasMessages(MESSAGE_ENABLE_ACCESSIBILITY)) {
--- a/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java
+++ b/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java
@@ -17,6 +17,7 @@
 package com.cyanogenmod.setupwizard.util;

 import android.accounts.AccountManager;
+import android.app.AppGlobals;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.ComponentInfo;
@@ -25,6 +26,8 @@ import android.content.pm.PackageManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.wifi.WifiManager;
+import android.os.IBinder;
+import android.os.ServiceManager;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.telephony.ServiceState;
@@ -32,6 +35,8 @@ import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.util.Log;

+import com.android.internal.os.IKillSwitchService;
+import com.android.internal.widget.LockPatternUtils;
 import com.cyanogenmod.setupwizard.SetupWizardApp;

 import com.google.android.gms.common.ConnectionResult;
@@ -80,10 +85,10 @@ public class SetupWizardUtils {
        TelephonyManager tm =
                (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
        if (tm.isMultiSimEnabled()) {
-            int phoneId = SubscriptionManager.getDefaultDataPhoneId();
+            int phoneId = SubscriptionManager.from(context).getDefaultDataPhoneId();
            android.provider.Settings.Global.putInt(context.getContentResolver(),
                    android.provider.Settings.Global.MOBILE_DATA + phoneId, enabled ? 1 : 0);
-            long subId = SubscriptionManager.getDefaultDataSubId();
+            int subId = SubscriptionManager.getDefaultDataSubId();
            tm.setDataEnabledUsingSubId(subId, enabled);
        } else {
            android.provider.Settings.Global.putInt(context.getContentResolver(),
@@ -113,7 +118,7 @@ public class SetupWizardUtils {
    public static boolean isSimMissing(Context context) {
        TelephonyManager tm =
                (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-        int simCount = SubscriptionManager.getActiveSubInfoCount();
+        int simCount = SubscriptionManager.from(context).getDefaultDataPhoneId();
        for (int i = 0; i < simCount; i++) {
            int simState = tm.getSimState(i);
            if (simState != TelephonyManager.SIM_STATE_ABSENT &&
@@ -124,6 +129,36 @@ public class SetupWizardUtils {
        return true;
    }

+    public static boolean isDeviceLocked() {
+        IBinder b = ServiceManager.getService(Context.KILLSWITCH_SERVICE);
+        IKillSwitchService service = IKillSwitchService.Stub.asInterface(b);
+        if (service != null) {
+            try {
+                return service.isDeviceLocked();
+            } catch (Exception e) {
+                // silently fail
+            }
+        }
+        return false;
+    }
+
+    public static boolean hasKillSwitch() {
+        IBinder b = ServiceManager.getService(Context.KILLSWITCH_SERVICE);
+        IKillSwitchService service = IKillSwitchService.Stub.asInterface(b);
+        if (service != null) {
+            try {
+                return service.hasKillSwitch();
+            } catch (Exception e) {
+                // silently fail
+            }
+        }
+        return false;
+    }
+
+    public static boolean hasAuthorized() {
+        return ((SetupWizardApp) AppGlobals.getInitialApplication()).isAuthorized();
+    }
+
    public static boolean isRadioReady(Context context, ServiceState state) {
        final SetupWizardApp setupWizardApp = (SetupWizardApp)context.getApplicationContext();
        if (setupWizardApp.isRadioReady()) {
@@ -158,6 +193,8 @@ public class SetupWizardUtils {
    public static void disableSetupWizard(Context context) {
        disableComponent(context, context.getPackageName(),
                "com.cyanogenmod.setupwizard.ui.SetupWizardActivity");
+        disableComponent(context, context.getPackageName(),
+                "com.cyanogenmod.setupwizard.setup.FinishSetupReceiver");
    }

    public static void disableGMSSetupWizard(Context context) {
@@ -225,4 +262,22 @@ public class SetupWizardUtils {
        context.getPackageManager().setComponentEnabledSetting(component,
                PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP);
    }
+
+    public static boolean hasLeanback(Context context) {
+        PackageManager packageManager = context.getPackageManager();
+        return packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK);
+    }
+
+    public static boolean hasFingerprint(Context context) {
+        LockPatternUtils lockPatternUtils = new LockPatternUtils(context);
+        return lockPatternUtils.isFingerprintInstalled(context);
+    }
+
+    public static final ComponentName mTvwifisettingsActivity =
+            new ComponentName("com.android.tv.settings",
+                    "com.android.tv.settings.connectivity.setup.WifiSetupActivity");
+
+    public static final ComponentName mTvAddAccessorySettingsActivity =
+            new ComponentName("com.android.tv.settings",
+                    "com.android.tv.settings.accessories.AddAccessoryActivity");
 }
--- a/tests/src/com/cyanogenmod/account/tests/ManualTestActivity.java
+++ b/tests/src/com/cyanogenmod/account/tests/ManualTestActivity.java
@@ -66,6 +66,10 @@ public class ManualTestActivity extends Activity {
                "com.cyanogenmod.setupwizard.ui.SetupWizardActivity");
        pm.setComponentEnabledSetting(componentName, PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
                PackageManager.DONT_KILL_APP);
+        componentName = new ComponentName("com.cyanogenmod.setupwizard",
+                "com.cyanogenmod.setupwizard.setup.FinishSetupReceiver");
+        pm.setComponentEnabledSetting(componentName, PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
+                PackageManager.DONT_KILL_APP);
        pm.clearApplicationUserData("com.cyanogenmod.setupwizard", null);
        ActivityManager am = (ActivityManager) getSystemService(Activity.ACTIVITY_SERVICE);
        am.killBackgroundProcesses("com.cyanogenmod.setupwizard");
Author	SHA1	Message	Date
d34d	9f21ed5e28	Enroll fingerprint via SetupWizard [2/2] Change-Id: Ieabfb0f3b789b02ddd1e17aba1eadfda52b21384	2015-07-10 22:44:36 -07:00
Matt Garnes	616db63139	Fix incorrect retrieval of SIM Network Operator. We were incorrectly passing the phone ID to TelephonyManager instead of the subscription ID. Pass the correct identifier to retrieve the network operator name. Change-Id: I266d2ce39c72db6e97eff5a36c5fec6242d516cc (cherry picked from commit `b31cb54361`)	2015-06-29 13:05:36 -07:00
Raj Yengisetty	497ddd6b71	SetupWizard: protect against IllegalStateExceptions in telephony Telephony throws this exception in some cases when retrieving SIM state Change-Id: I87e14aaa328d46ebba4990559f6531de4e961d68 (cherry picked from commit `b72e820a96`)	2015-06-19 01:04:59 +00:00
emancebo	ffc0dbd2fb	SetupWizard: add overlay to uncheck cyanogen theme option by default Change-Id: I278dcb3b2d8099b71a66d90250c40836dd8ec7fc (cherry picked from commit `7a255f6e5c`)	2015-06-18 16:57:57 +00:00
cretin45	c5e926d67f	SetupWizard: Add hook to finish setup for CTS automation Change-Id: Ifd7edda671fd8011a9b9ed894333c292cd0c3331	2015-06-17 13:56:09 -07:00
Roman Birg	1fc47a0a79	SetupWizard: allow FINISH_SETUP to be granted via whitelist Required by http://review.cyanogenmod.org/#/c/100839/ Change-Id: Id3b62c396b5be3497be004f0f3807d8627c4e4da Signed-off-by: Roman Birg <roman@cyngn.com>	2015-06-15 23:26:35 +00:00
Michael Bestas	761381fd01	Automatic translation import Change-Id: Id7898af5ac5ceb99d18b984f321166dbe780edb8	2015-06-13 21:04:23 +03:00
cretin45	b7c51828ed	SetupWizard: Ensure setup complete flags are set for secondary users Change-Id: If96abdb6ccc52f7049018dcae6576dd1b886fc0f	2015-06-12 12:24:30 -07:00
Michael Bestas	82bbed9d9c	Automatic translation import Change-Id: Ie54c22f80639bda17b1d926fac2b31137dba4620	2015-06-09 20:35:55 +03:00
Michael Bestas	b94d4434d5	Automatic translation import Change-Id: I08c97e02da04e4f471bd7e59ce60a5a334be5623	2015-05-31 16:59:07 +03:00
Michael Bestas	a9d0039761	Automatic translation import Change-Id: Ifa05ef59df4c397f799637fb2d8fa153c84e57fd	2015-05-24 23:36:21 +03:00
emancebo	b2ceb1f8bb	OOBE: fix NPE in choose data sim page Change-Id: Ib6228e7cd223d29ac48200e9a50c0900d35f8a4e	2015-05-18 16:25:14 +00:00
Michael Bestas	3d884cef0e	Automatic translation import Change-Id: Ib46208f9ee1b87700f5d3d19aaa0d44cf054ec0c	2015-05-16 00:03:00 +03:00
Roman Birg	bfd3abd0c7	SetupWizard: hide WhisperPush if it's not installed Change-Id: I7576a2ee0f851e1222b6ed4d53188950b20b6a16 Signed-off-by: Roman Birg <roman@cyngn.com>	2015-05-13 19:33:58 -07:00
cretin45	7710855b72	SetupWizard: Add kill switch implementation Change-Id: I1335cddf0dcc94eb8d2defeebdc47cb61abffd06	2015-05-08 11:44:34 -07:00
cretin45	4d08b90df3	SetupWizard: Use the system property mobile data page visibility Change-Id: I3a3301bcdbc2200ba62067188e59c886a0891788	2015-05-07 14:05:29 -07:00
cretin45	b076a55991	SetupWizard: Use new LegaleseViewer for privacy policy web views WebViews are no longer allowed in priv-apps. Change-Id: Iddf9c79d50ea9f9d9d32218342f9948a6cbf30ef	2015-05-06 16:03:38 -07:00
cretin45	ac84dc0fce	Setupwizard: Fix msim NPE where sim only in slot 2 Change-Id: I919129185cb49c51f9f02d9718e116e7d02b0d2c	2015-05-04 16:03:08 -07:00
Michael Bestas	676081a4ad	Automatic translation import Change-Id: I6b8d3fb084df5abb3449b842ce02d1d6aaf2170a	2015-05-02 03:34:53 +03:00
cretin45	9dd952e3f6	SetupWizard: Increase delay for accessibility Change-Id: Ifff7161f95e91ec7763f388206cd1d30804ad600	2015-05-01 13:14:03 -07:00
Roman Birg	3c37b0b69c	SetupWizard: update stats permission and package Change-Id: I3ef19b616422ca5cc0896840753192b1c1712525 Signed-off-by: Roman Birg <roman@cyngn.com>	2015-04-27 13:30:08 -07:00
dhacker29	2a98e6f6f6	Disable the CyanogenServicesPage if FEATURE_LEANBACK detected TV devices will not benefit from having a CM account. Change-Id: I5258a1442c400b35d92c22a2b0e8dcbe3516aead	2015-04-25 07:24:49 +00:00
Michael Bestas	3371e61bb8	Automatic translation import Change-Id: Ifc62c159189df11f3443defc57069ab5b78b644f	2015-04-25 01:30:10 +03:00
dhacker29	218deb9952	If this is a TV device launch bluetooth pairing before Welcome page TV devices like fugu don't have a default input method and expect to be able to pair the bluetooth remote during setup without having to manually initiate it with the bottom button on the device. Change-Id: I88246fe9b28a85dc334c0108b818e78cb29491bb	2015-04-24 01:32:19 -04:00
dhacker29	de06181c7e	WifiSetup: If device has Leanback feature specify tv.settings Fugu has both com.android.settings and com.android.tv.settings so currently it brings up a selector dialog for how to handle the wifi intent, which leads to "Activity is launching as a new task, so cancelling activity result." Fix this by passing the component name in the intent if FEATURE_LEANBACK is present Change-Id: I470590315d3f95a32b7796dd4a916a543392fcd6	2015-04-23 02:31:51 -04:00
Pawit Pornkitprasan	cfc4a0db64	SetupWizard: handle skipping id in SubInfoRecords This extends I3b4132afccc96a5d08986a3cb902bd384931f21f to actually work. Change-Id: I9183626b40edda6a96888dca2816ff116b64bc5e	2015-04-20 15:55:30 -07:00
Pawit Pornkitprasan	dd500a1f42	SetupWizard: don't access SubscriptionController directly SubscriptionController exists in the telephony process and cannot be accessed by SetupWizard. getInstance() will always return null. Change-Id: I017682d3aad539e1954348664b1c1fec7f76009d	2015-04-20 15:53:19 -07:00
Michael Bestas	317a6cb891	Automatic translation import Change-Id: I1649ba39d39b73ce351909a310041d6f6b0a99b7	2015-04-17 23:06:02 +03:00
cretin45	f654deb217	SetupWizard: Give radio a 10 second chance to come up Change-Id: Iadd817b200106783dd67edbc5ad03928ce2baa6b	2015-04-17 03:44:08 +03:00
cretin45	bfd7ca0545	Setupwizard: Make sure to advance if GMS is absent Change-Id: Ia0c4d83c9a9f7c581208d753024f55f48326afc7 (cherry picked from commit `cb09e29e29`)	2015-04-09 20:36:04 +00:00
cretin45	714be1a490	SetupWizard: Aggressively hide nav bar on soft key devices Change-Id: Ic23fd7e605a323411fe2f581235ff3ed45bfcaed (cherry picked from commit `1d7988a4c7`)	2015-04-09 20:35:42 +00:00
cretin45	317a15e0eb	SetupWizard: Ensure page object isn't null if FM destroyed Change-Id: Ia794e7656587ca803d02418d3d84d4df5027cd00 (cherry picked from commit `62b79e3880`)	2015-04-09 20:35:15 +00:00
Michael Bestas	e68543ad74	Automatic translation import Change-Id: Ifa97d2292f1ab37a21a8695a53e673f406df706b (cherry picked from commit `cc9467cfbd`)	2015-04-09 20:34:34 +00:00
cretin45	6d63e95342	SetupWizard: Handle all touch events in EnableAccessibilityController Change-Id: Icf15be21c90d32305a9c1f8b9835eb473acf1f33 (cherry picked from commit `0fde3a04cc`)	2015-04-09 20:34:18 +00:00
cretin45	e79aa7f0bf	SetupWizard: Don't assume order of SubInfoRecords Change-Id: I3b4132afccc96a5d08986a3cb902bd384931f21f	2015-04-09 13:32:59 -07:00
Aaahh	22df00177f	SetupWizard: Disable Checkbox on Resume Change-Id: Ica6f3043b9b0d3703b6ce6f47a43b5201deb05b7 (cherry picked from commit `9192fc6903`)	2015-04-09 19:14:13 +00:00
Michael Bestas	645ffa8436	Automatic translation import Change-Id: Icd2308a33556872fa1564058b8250c60dc1b8372 (cherry picked from commit `6fb3d23f09`)	2015-04-01 02:05:09 +00:00
cretin45	27457414c8	SetupWizard: Lock orientation prior to finish animation Change-Id: I43a69937e2deb5f55585522fe5d00c51ffdae569 (cherry picked from commit `c8e4c29020`)	2015-04-01 02:04:23 +00:00
Michael Bestas	b00440ec27	Automatic translation import Change-Id: I9aa0c0cf342d79ffcdb42e8c87284ad354fc9563 (cherry picked from commit `afcf65d6c0`)	2015-04-01 02:03:40 +00:00
cretin45	76101714d7	SetupWizard: Initialize the nav keys bundle boolean Change-Id: I50f2ef0fb7226c8b58437b669ca71df436d68ee8 (cherry picked from commit `33683fc2ce`)	2015-04-01 02:03:03 +00:00
cretin45	2a01a24066	SetupWizard: Fix regression for devices without custom default theme Change-Id: Ia223c1b118dbb68e596ff01cf944bc870a321752 (cherry picked from commit `838248ab86`)	2015-04-01 02:02:23 +00:00
cretin45	d0389e4e6e	SetupWizard: Fix regression, only init pages once Change-Id: I1207cb3975daa752a66eb8e9e40635f9a8009509 (cherry picked from commit `83be05d6ec`)	2015-04-01 02:01:32 +00:00
cretin45	dbc1ceb8ca	SetupWizard: Better handling of launching into other activities Change-Id: I4d8dc4a1b25e45c6ff35042239a0adf4c16458f1 (cherry picked from commit `ed5d46703e`)	2015-04-01 01:59:25 +00:00
d34d	88aba00aa3	Disable theme components for secondary users This patch is to mitigate theming problems with multiple users. Once themes properly support multiple users we can revert this. Change-Id: Idc89a273bc1563fc668ca2a5a591cf133e8d5406 (cherry picked from commit `836f867086`)	2015-04-01 01:58:53 +00:00
Michael Bestas	2104b3f5db	Automatic translation import Change-Id: If0a158896a3ec49fb0b32c48c6f426dea4d9b653 (cherry picked from commit `c7b84c2793`)	2015-04-01 01:52:07 +00:00
Roman Birg	98b5eb9958	SetupWizard: don't crash without SIMs SubscriptionManager may be null Change-Id: Ia2112044400576a93931474a3fff2af161ccda21 Signed-off-by: Roman Birg <roman@cyngn.com>	2015-03-26 03:44:35 -07:00
Steve Kondik	c225cd58f7	setupwizard: Adapt to MR1 multisim APIs Change-Id: Icb5bad076fe5a5e8a26befc5bedd04981c374117	2015-03-22 17:18:31 -07:00