SuW: Remove PG bits

Change-Id: Ic7297e0dcf1c9b438171e5ebe688e83e5cb121e9

Android.mk

@@ -15,12 +15,9 @@ LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 LOCAL_STATIC_ANDROID_LIBRARIES := \
-    android-support-v4 \
+    androidx.core_core \
-    android-support-v7-appcompat \
+    setupcompat \
-    android-support-v7-preference \
+    setupdesign
-    android-support-v7-recyclerview \
-    android-support-v13 \
-    android-support-v14-preference
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     libphonenumber \
@@ -33,9 +30,6 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
 LOCAL_USE_AAPT2 := true
 
-include frameworks/opt/setupwizard/navigationbar/common.mk
-include frameworks/opt/setupwizard/library/common-gingerbread.mk
-
 include $(BUILD_PACKAGE)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))

proguard.flags

@@ -9,4 +9,4 @@
 
 # Needed when building against the Marshmallow SDK
 -dontwarn org.apache.http.**
--dontwarn android.support.**
+-dontwarn androidx.**

res/layout/choose_data_sim_page.xml

@@ -64,7 +64,11 @@
             android:layout_gravity="top"
             android:visibility="gone"/>
     </FrameLayout>
-    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
+
+    <com.google.android.setupdesign.view.NavigationBar
         android:id="@+id/navigation_bar"
-        style="@style/setup_wizard_navbar_style" />
+        style="@style/SudNavBarTheme"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/sud_navbar_height" />
+
 </LinearLayout>

res/layout/finish_activity.xml

@@ -42,10 +42,11 @@
             android:gravity="center"
             android:padding="@dimen/content_margin_left"/>
 
-
+        <com.google.android.setupdesign.view.NavigationBar
-        <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
             android:id="@+id/navigation_bar"
-                  style="@style/setup_wizard_navbar_style" />
+            style="@style/SudNavBarTheme"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/sud_navbar_height" />
 
     </LinearLayout>
 

res/layout/location_settings.xml

@@ -156,7 +156,11 @@
             </LinearLayout>
         </ScrollView>
     </FrameLayout>
-    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
+
+    <com.google.android.setupdesign.view.NavigationBar
         android:id="@+id/navigation_bar"
-        style="@style/setup_wizard_navbar_style" />
+        style="@style/SudNavBarTheme"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/sud_navbar_height" />
+
 </LinearLayout>

res/layout/mobile_data_settings.xml

@@ -103,7 +103,11 @@
             </LinearLayout>
         </ScrollView>
     </FrameLayout>
-    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
+
+    <com.google.android.setupdesign.view.NavigationBar
         android:id="@+id/navigation_bar"
-        style="@style/setup_wizard_navbar_style" />
+        style="@style/SudNavBarTheme"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/sud_navbar_height" />
+
 </LinearLayout>

res/layout/setup_datetime_page.xml

@@ -111,7 +111,11 @@
             </LinearLayout>
         </ScrollView>
     </FrameLayout>
-    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
+
+    <com.google.android.setupdesign.view.NavigationBar
         android:id="@+id/navigation_bar"
-              style="@style/setup_wizard_navbar_style" />
+        style="@style/SudNavBarTheme"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/sud_navbar_height" />
+
 </LinearLayout>

res/layout/setup_fingerprint.xml

@@ -89,7 +89,11 @@
             </LinearLayout>
         </ScrollView>
     </FrameLayout>
-    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
+
+    <com.google.android.setupdesign.view.NavigationBar
         android:id="@+id/navigation_bar"
-        style="@style/setup_wizard_navbar_style" />
+        style="@style/SudNavBarTheme"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/sud_navbar_height" />
+
 </LinearLayout>

res/layout/setup_lineage_settings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
+     Copyright (C) 2017,2019 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -123,46 +123,14 @@
 
                 </LinearLayout>
 
-                <LinearLayout
-                    android:id="@+id/privacy_guard"
-                    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"
-                    android:clickable="true">
-
-                    <CheckBox
-                        android:id="@+id/privacy_guard_checkbox"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="top"
-                        android:layout_marginTop="5dp"
-                        android:duplicateParentState="true"
-                        android:clickable="false" />
-
-                    <TextView
-                        android:id="@+id/privacy_guard_summary"
-                        android:layout_width="0px"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:textSize="15sp"
-                        android:lineSpacingExtra="@dimen/setup_line_spacing"
-                        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"
-                        android:text="@string/services_os_privacy_guard"/>
-
-                </LinearLayout>
-
             </LinearLayout>
         </ScrollView>
     </FrameLayout>
 
-    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
+    <com.google.android.setupdesign.view.NavigationBar
         android:id="@+id/navigation_bar"
-              style="@style/setup_wizard_navbar_style" />
+        style="@style/SudNavBarTheme"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/sud_navbar_height" />
 
 </LinearLayout>

res/layout/setup_loading_page.xml

@@ -38,7 +38,10 @@
                  android:layout_weight="1"
                  style="@style/PageContent"/>
 
-    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
+    <com.google.android.setupdesign.view.NavigationBar
         android:id="@+id/navigation_bar"
-        style="@style/setup_wizard_navbar_style" />
+        style="@style/SudNavBarTheme"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/sud_navbar_height" />
+
 </LinearLayout>

res/layout/setup_locale.xml

@@ -42,9 +42,10 @@
 
     </RelativeLayout>
 
-
+    <com.google.android.setupdesign.view.NavigationBar
-    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
         android:id="@+id/navigation_bar"
-              style="@style/setup_wizard_navbar_style" />
+        style="@style/SudNavBarTheme"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/sud_navbar_height" />
 
 </LinearLayout>

res/layout/setup_lockscreen.xml

@@ -67,7 +67,11 @@
             </LinearLayout>
         </ScrollView>
     </FrameLayout>
-    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
+
+    <com.google.android.setupdesign.view.NavigationBar
         android:id="@+id/navigation_bar"
-        style="@style/setup_wizard_navbar_style" />
+        style="@style/SudNavBarTheme"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/sud_navbar_height" />
+
 </LinearLayout>

res/layout/sim_missing_page.xml

@@ -55,7 +55,11 @@
 
         </LinearLayout>
     </FrameLayout>
-    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
+
+    <com.google.android.setupdesign.view.NavigationBar
         android:id="@+id/navigation_bar"
-        style="@style/setup_wizard_navbar_style" />
+        style="@style/SudNavBarTheme"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/sud_navbar_height" />
+
 </LinearLayout>

res/layout/welcome_activity.xml

@@ -35,9 +35,10 @@
         android:gravity="center"
         android:padding="@dimen/content_margin_left"/>
 
-
+    <com.google.android.setupdesign.view.NavigationBar
-    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
         android:id="@+id/navigation_bar"
-        style="@style/setup_wizard_navbar_style" />
+        style="@style/SudNavBarTheme"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/sud_navbar_height" />
 
 </LinearLayout>

res/values-af/strings.xml

@@ -61,7 +61,6 @@
     <string name="services_explanation" product="default">Hierdie dienste werk vir jou om die vermoëns van jou foon uit te brei. Data sal in ooreenkomstig met LineageOS se <xliff:g id="name" example="Privaatheidspolitiek">%s</xliff:g> gebruik word.</string>
     <string name="services_privacy_policy">Privaatheid beleid</string>
     <string name="services_os_nav_keys_label"><b>Gebruik skerm navigasie sleutels</b> in plaas van hardeware sleutels.</string>
-    <string name="services_os_privacy_guard"><b>Aktiveer privatheidheidswag</b>om jou persoonlike data soos kontakte, boodskappe of oproepgeskiedenis nie beskikbaar vir nuut geïnstalleerde toepassings te maak nie</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>Jou rekening wagwoord sal vereis word</b> om jou toestel te gebruik, selfs na \'n fabriek herstel.</string>

res/values-ar/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">ساهم في تحسين <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> بإرسال بيانات التشخيص و الاستعمال تلقائيا إلى LineageOS. لا يمكن استعمال هذه المعلومات لتحديد هويتك، لكنها تساعد الفرق المكلفة بـ: عمر البطارية، أداء التطبيقات، و مزايا <xliff:g id="name" example="LineageOS">%2$s</xliff:g> الجديدة.</string>
     <string name="services_os_nav_keys_label"><b>استخدام مفاتيح التنقل على الشاشة</b> بدلاً من مفاتيح الأجهزة.</string>
-    <string name="services_os_privacy_guard"><b>تمكين حماية الخصوصية</b> لجعل بياناتك الشخصية مثل الرسائل أو جهات الاتصال، وسجلات المكالمات غير متوفرة للتطبيقات المثبتة حديثًا</string>
     <string name="setup_unlock">فتح القفل</string>
     <string name="setup_device_locked">هذا الجهاز تم قفله من قبل المستخدم.</string>
     <string name="setup_require_cyanogen_label"><b>يتطلب كلمة مرور حسابك</b> حتى تتمكن من استخدام الجهاز حتى بعد إعادة تعيين المصنع.</string>

res/values-ast-rES/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">Ayuda a ameyorar <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> unviando diagnósticos y datos d\'usu de mou automáticu a LineageOS. Esta información nun pue usase pa identificate y écha-yos un gabitu a los equipos que trabayen en coses como la duración de la batería, el rindimientu d\'aplicaciones y les carauterístiques nueves de <xliff:g id="name" example="LineageOS">%2$s</xliff:g>.</string>
     <string name="services_os_nav_keys_label"><b>Usar tecles de navegación na pantalla</b> en cuantes de tecles físiques.</string>
-    <string name="services_os_privacy_guard"><b>Habilitar Guardián de privacidá</b> pa facer que los tos datos personales como contautos, mensaxes, rexistros de llamaes... etc, nun tean disponibles p\'aplicaciones que teas acabante d\'instalar</string>
     <string name="setup_unlock">Desbloquiar</string>
     <string name="setup_device_locked">Esti preséu ta bloquiáu pol usuariu.</string>
     <string name="setup_require_cyanogen_label"><b>Riquir la contraseña de la to cuenta</b> pa usar el to preséu incluso dempués de reafitalu.</string>

res/values-az/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm"><xliff:g id="name" example="LineageOS">%s</xliff:g>u təkmilləşdirməyə kömək edin</string>
     <string name="services_metrics_label">LineageOS-a diaqnostikanı və istifadə verilənlərini avtomatik göndərərək <xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g>. Bu məlumatlarda kimliyiniz istifadə edilmir və batereya ömrü, tətbiq performansı və yeni <xliff:g id="name" example="LineageOS">%2$s</xliff:g> xüsusiyyətləri kimi işlərlə məşğul olan komandalara kömək edər.</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>
-    <string name="services_os_privacy_guard">Şəxsləriniz, mesajlarınız və zəng jurnalınız kimi şəxsi verilənlərinizin, yeni quraşdırılmış tətbiqlər üçün əlçatan olmaması üçün <b>Gizlilik qorumasını fəallaşdır</b></string>
     <string name="setup_unlock">Kilidi aç</string>
     <string name="setup_device_locked">Bu cihaz istifadəçisi tərəfindən kilidlənib.</string>
     <string name="setup_require_cyanogen_label"><b>Hesab şifrəniz</b> cihazınızı sıfırladıqdan sonra istifadə edə bilmək üçün lazımdır.</string>

res/values-bg/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">Помогне за подобряване на <xliff:g id="name" example="LineageOS">%s </xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s </xliff:g> от автоматичното изпращане на данни за диагностика и използване на LineageOS\'s. Тази информация не може да се използва за идентифицирането ви и служи да помага на екипите работещи над неща като живот на батерията, производителността на приложенията и нови функции в <xliff:g id="name" example="LineageOS"> %2$s </xliff:g>.</string>
     <string name="services_os_nav_keys_label"><b>Използване на клавишите за навигация на екрана</b> вместо хардуерните бутони.</string>
-    <string name="services_os_privacy_guard"><b>Активирайте Privacy guard</b> за да направите вашите лични данни, като контакти, съобщения или регистъра с повиквания да не са налични за наскоро инсталирани приложения</string>
     <string name="setup_unlock">Отключи</string>
     <string name="setup_device_locked">Това устройство е заключено от потребителя.</string>
     <string name="setup_require_cyanogen_label"><b>Изисква паролата на акаунта</b> за да използвате устройството дори след фабрично нулиране.</string>

res/values-ca/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">Ajuda a millorar <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> enviant automàticament les dades de diagnòstic i d\'ús a LineageOS. Aquesta informació no es pot utilitzar per identificar-te i dóna un cop de mà als equips que treballen en coses com la duració de les bateries, el rendiment de les aplicacions i noves característiques de <xliff:g id="name" example="LineageOS">%2$s</xliff:g>.</string>
     <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_os_privacy_guard"><b>Habilita el Guarda de privacitat</b> per assegurar que les teves dades personals com ara contactes, missatges o registres de trucades no estan disponibles per a les noves aplicacions instal·lades</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 teva contrasenya del compte</b> per utilitzar el teu dispositiu, fins i tot després de restablir les configuracions de fàbrica.</string>

res/values-cs/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">Pomozte vylepšit <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> automatickým odesíláním diagnostických dat a dat o používání do LineageOS. Tato data nelze použít pro Vaší identifikaci, ale pomohou vývojářskému týmu s informacemi o výdrži baterie, výkonu aplikací a vývoji nových vlastností pro <xliff:g id="name" example="LineageOS">%2$s</xliff:g>.</string>
     <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_os_privacy_guard"><b>Povolit Ochranu soukromí</b>, aby vaše osobní údaje (například kontakty, zprávy nebo záznamy hovorů) nebyly dostupné pro nově instalované aplikace</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</b>.</string>

res/values-cy/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">Helpu i wella <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> gan anfon gwybodaeth ddiagnostig a defnydd data at LineageOS. Ni fydd yn bosib defnyddio\'r wybodaeth i dy adnabod di ac mi fydd o help mawr i\'r timau sy\'n gweithio ar bethau fel gwella perfformiad apiau a bywyd batri a chreu nodweddion newydd yn <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
     <string name="services_os_nav_keys_label"><b>Defnyddio bysellau llywio ar y sgrin</b> yn hytrach na botymau\'r ddyfais.</string>
-    <string name="services_os_privacy_guard"><b>Galluogi\'r Gwarchodwr Preifatrwydd</b> fel nad yw dy ddata personol, megis cysylltiadau, negeseuon na logiau galwadau, ar gael i apiau newydd sy\'n cael eu gosod.</string>
     <string name="setup_unlock">Datgloi</string>
     <string name="setup_device_locked">Mae\'r ddyfais hon wedi ei chloi gan y defnyddiwr.</string>
     <string name="setup_require_cyanogen_label"><b>Mynna bod angen cyfrinair dy gyfrif</b> er mwyn medru defnyddio\'r ddyfais, hyd yn oed os yw\'n cael ei ailosod i fel yr oedd yn gadael y ffatri.</string>

res/values-da/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">Hjælp med at forbedre <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> ved automatisk at sende diagnostik and brugsdata to LineageOS. Denne information kan ikke bruges til at identificere dig og giver en hånd til hold, som arbejder på ting som batterilevetid, app-ydeevne, and nye <xliff:g id="name" example="LineageOS">%2$s</xliff:g>-funktioner.</string>
     <string name="services_os_nav_keys_label"><b>Brug navigationstaster på skærm</b> i stedet for fysiske-taster.</string>
-    <string name="services_os_privacy_guard"><b>Aktivér Privatlivsvagt</b>, for at gøre dine personlige data, så som kontaktpersoner, meddelelser, og opkaldshistorik utilgængelige for nyinstallerede apps</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 konto</b> for at bruge enheden, selv efter en nulstilling til fabriksindstillinger.</string>

res/values-de/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">Helfen Sie <xliff:g id="name" example="LineageOS">%s</xliff:g> zu verbessern</string>
     <string name="services_metrics_label"><xliff:g id="name" example="Helfen Sie LineageOS zu verbessern">%1$s</xliff:g>, indem Sie automatisch Diagnose-und Nutzungsdaten an LineageOS senden. Diese Informationen können nicht dazu verwendet werden, Sie zu identifizieren. Vielmehr helfen Sie unserem Team bei der Arbeit an Dingen wie der Akkulaufzeit, der App-Leistung und <xliff:g id="name" example="LineageOS">%2$s</xliff:g>-Funktionen.</string>
     <string name="services_os_nav_keys_label"><b>Bildschirm-Navigationstasten</b> statt Hardwaretasten verwenden.</string>
-    <string name="services_os_privacy_guard"><b>Aktivieren Sie den Datenschutz</b>, um Ihre persönlichen Daten wie Kontakte, Nachrichten oder Anrufe nicht für neu installierte Anwendungen verfügbar zu machen</string>
     <string name="setup_unlock">Entsperren</string>
     <string name="setup_device_locked">Dieses Gerät wurde vom Benutzer gesperrt.</string>
     <string name="setup_require_cyanogen_label"><b>Ihr Konto-Passwort</b> wird auch nach einem Zurücksetzen auf Werkseinstellungen benötigt.</string>

res/values-el/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">Βοηθήστε στη βελτίωση του <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> στέλνοντας αυτόματα διαγνωστικά δεδομένα και στατιστικά χρήσης στο LineageOS. Αυτές οι πληροφορίες δε μπορούν να χρησιμοποιηθούν για να σας αναγνωρίσουν και δίνουν ένα χέρι βοηθείας στις ομάδες που εργάζονται σε θέματα όπως η διάρκεια ζωής μπαταρίας, επιδόσεις εφαρμογών και νέα χαρακτηριστικά του <xliff:g id="name" example="LineageOS">%2$s</xliff:g>.</string>
     <string name="services_os_nav_keys_label"><b>Κάντε χρήση των πλήκτρων πλοήγησης της οθόνης</b> αντί των φυσικών πλήκτρων.</string>
-    <string name="services_os_privacy_guard"><b>Ενεργοποίηση της Προστασίας Απορρήτου</b> για την απόκρυψη των προσωπικών σας δεδομένων όπως όπως επαφές, μηνύματα ή το αρχείο κλήσεων από τις πρόσφατα εγκατεστημένες εφαρμογές</string>
     <string name="setup_unlock">Ξεκλείδωμα</string>
     <string name="setup_device_locked">Αυτή η συσκευή έχει κλειδωθεί από το χρήστη.</string>
     <string name="setup_require_cyanogen_label"><b>Απαίτηση του κωδικού πρόσβασης του λογαριασμού σας</b> για να χρησιμοποιήσετε τη συσκευή σας, ακόμα και μετά από επαναφορά εργοστασιακών ρυθμίσεων.</string>

res/values-en-rAU/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">Help improve <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> by automatically sending diagnostic and usage data to LineageOS. This information can’t be used to identify you and lends a hand to teams working on things like battery life, app performance, and new <xliff:g id="name" example="LineageOS">%2$s</xliff:g> features.</string>
     <string name="services_os_nav_keys_label"><b>Use on screen navigation keys</b> instead of hardware keys.</string>
-    <string name="services_os_privacy_guard"><b>Enable Privacy guard</b> to make your personal data such as contacts, messages or call logs not available for newly installed apps</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 account password</b> in order to use your device even after a factory reset.</string>

res/values-en-rCA/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">Help improve <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> by automatically sending diagnostic and usage data to LineageOS. This information can’t be used to identify you and lends a hand to teams working on things like battery life, app performance, and new <xliff:g id="name" example="LineageOS">%2$s</xliff:g> features.</string>
     <string name="services_os_nav_keys_label"><b>Use on screen navigation keys</b> instead of hardware keys.</string>
-    <string name="services_os_privacy_guard"><b>Enable Privacy guard</b> to make your personal data such as contacts, messages or call logs not available for newly installed apps</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 account password</b> in order to use your device even after a factory reset.</string>

res/values-en-rGB/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">Help improve <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> by automatically sending diagnostic and usage data to LineageOS. This information can’t be used to identify you and lends a hand to teams working on things like battery life, app performance, and new <xliff:g id="name" example="LineageOS">%2$s</xliff:g> features.</string>
     <string name="services_os_nav_keys_label"><b>Use on screen navigation keys</b> instead of hardware keys.</string>
-    <string name="services_os_privacy_guard"><b>Enable Privacy guard</b> to make your personal data such as contacts, messages or call logs not available for newly installed apps</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 account password</b> in order to use your device even after a factory reset.</string>

res/values-en-rIN/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">Help improve <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> by automatically sending diagnostic and usage data to LineageOS. This information can’t be used to identify you and lends a hand to teams working on things like battery life, app performance, and new <xliff:g id="name" example="LineageOS">%2$s</xliff:g> features.</string>
     <string name="services_os_nav_keys_label"><b>Use on screen navigation keys</b> instead of hardware keys.</string>
-    <string name="services_os_privacy_guard"><b>Enable Privacy guard</b> to make your personal data such as contacts, messages or call logs not available for newly installed apps</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 account password</b> in order to use your device even after a factory reset.</string>

res/values-es-rUS/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">Ayuda a mejorar <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> enviando automáticamente diagnósticos y uso de datos a LineageOS. Esta información no se utilizará para identificarte y sirve para mejorar la vida útil de la batería, el rendimiento de la aplicación y el desarrollo de nuevas características de <xliff:g id="name" example="LineageOS">%2$s</xliff:g>.</string>
     <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_os_privacy_guard"><b>Activar «Guardián de privacidad»</b> para sus datos personales como contactos, mensajes o llamada registros, no está disponible para aplicaciones recién instaladas</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 necesita la contraseña de la cuenta</b> para poder utilizar el dispositivo incluso después de un restablecimiento de fábrica.</string>

res/values-es/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">Ayuda a mejorar <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> enviando automáticamente diagnósticos y uso de datos a LineageOS. Esta información no se utilizará para identificarte y sirve para mejorar la vida útil de la batería, el rendimiento de la aplicación y el desarrollo de nuevas características de <xliff:g id="name" example="LineageOS">%2$s</xliff:g>.</string>
     <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_os_privacy_guard"><b>Habilitar Privacy guard</b> para sus datos personales como contactos, mensajes o registros de llamadas. No está disponible para aplicaciones recién instaladas</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>Requieren la contraseña de tu cuenta</b> para poder utilizar el dispositivo incluso después de un restablecimiento.</string>

res/values-eu/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">Lagundu <xliff:g id="name" example="LineageOS">%s</xliff:g> hobetzen</string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> automatikoki diagnostiko eta erabilera datuak bidaliz LineageOS-i. Informazio hau ezin da erabili zu identifikatzeko eta bateriaren iraupenean, aplikazioen errendimenduan, eta <xliff:g id="name" example="LineageOS">%2$s</xliff:g>-en ezaugarri berrietan lanean dabilen taldearentzat lagungarria da.</string>
     <string name="services_os_nav_keys_label"><b>Erabili pantailako nabigazio teklak</b> hardware teklen ordez.</string>
-    <string name="services_os_privacy_guard"><b>Gaitu Privacy guard</b> zure datu pertsonalak, esaterako kontaktuak, mezuak edo deien erregistroa instalatu berri dituzun aplikazioen eskura egon ez daitezen</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 kontuaren pasahitza</b> gailua erabiltzeko lantegiko jatorrizko ezarpenetara berrezarri eta gero ere.</string>

res/values-fi/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">Auta parantamaan <xliff:g id="name" example="LineageOS">%s</xliff:g>ia</string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> lähettämällä vianmääritys- ja käyttötietoja LineageOS:lle. Tietoja ei voi käyttää tunnistamiseen. Tiedot auttavat kehittäjiä muun muassa parantamaan akun kestoa, sovellusten suorituskykyä ja kehittämään <xliff:g id="name" example="LineageOS">%2$s</xliff:g>:iin uusia ominaisuuksia.</string>
     <string name="services_os_nav_keys_label"><b>Käytä näytön navigointipalkkia</b> fyysisten näppäinten sijaan.</string>
-    <string name="services_os_privacy_guard"><b>Ota Yksityisyyden suojaus käyttöön</b> estääksesi uusia sovelluksia käyttämästä tietoja kuten yhteystietoja, viestejä tai puhelulokeja ilman lupaa</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 tilin salasana</b> käyttääksesi laitetta myös tehdasasetusten palautuksen jälkeen.</string>

res/values-fr/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">Contribuer à l\'amélioration de <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> en envoyant automatiquement des données de diagnostic et d\'utilisation à LineageOS. Ces informations ne peuvent pas être utilisées pour vous identifier et aident nos équipes à améliorer l\'autonomie de la batterie et les performances des applications, et à développer de nouvelles fonctionnalités pour <xliff:g id="name" example="LineageOS">%2$s</xliff:g>.</string>
     <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_os_privacy_guard"><b>Activer la protection des données</b> pour que vos données personnelles comme les contacts, messages ou les journaux d\'appels ne soient pas disponibles pour les applications nouvellement installées</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 le mot de passe de votre compte</b> afin d\'utiliser votre appareil même après une réinitialisation d\'usine.</string>

res/values-fy-rNL/strings.xml

@@ -61,7 +61,6 @@
     <string name="services_explanation" product="default">Dizze tsjinsten wurde brûkt om de mooglikheden fan jo telefoan út te wreidzjen. Gegevens wurde brûkt konfoarm it ‘<xliff:g id="name" example="Privacybelied">%s</xliff:g>’ fan LineageOS.</string>
     <string name="services_privacy_policy">Privacybelied</string>
     <string name="services_os_nav_keys_label"><b>On-screen navigaasjeknoppen</b> brûke yn stee fan de hardwareknoppen.</string>
-    <string name="services_os_privacy_guard"><b>Privacybeskerming ynskeakelje</b> om jo persoanlike gegevens lykas kontakten, berjochten of opropskiednis net beskikber te meitsjen foar nij ynstallearre apps</string>
     <string name="setup_unlock">Untskoattelje</string>
     <string name="setup_device_locked">Dit apparaat is beskoattele troch de brûker.</string>
     <string name="setup_require_cyanogen_label"><b>Jo accountwachtwurd fereaskje</b> om it apparaat te brûken, sels nei weromsetten nei fabryksynstellingen.</string>

res/values-gl/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">Axuda a mellorar <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Axuda a mellorar LineageOS">%1$s</xliff:g> enviando automaticamente diagnóstico e uso de datos a LineageOS. Esta información non se pode utilizar para identificalo a vostede e acaba nas mans dos equipos que traballan en cousas como a duración da batería, rendemento das aplicacións e novas características de <xliff:g id="name" example="LineageOS">%2$s</xliff:g>.</string>
     <string name="services_os_nav_keys_label"><b>Usar as teclas de navegación</b> en vez das do hardware.</string>
-    <string name="services_os_privacy_guard"><b>Habilitar Privacy guard</b> para seus datos personais como contactos, mensaxes o rexistros de chamadas non está dispoñible para aplicacións recién instaladas</string>
     <string name="setup_unlock">Desbloquear</string>
     <string name="setup_device_locked">Este dispositivo foi bloqueado polo usuario.</string>
     <string name="setup_require_cyanogen_label"><b>Precísase o seu contrasinal</b> para poder utilizar o seu dispositivo mesmo tras unha restauración de fábrica.</string>

res/values-hr/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">Pomozite poboljšati <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g>  automatskim slanjem dijagnostičkih podataka i podataka o korištenju LineageOS-u. Ove se informacije ne mogu upotrebljavati kako bi vas identificirale i puno pomažu timovima koji rade na stvarima kao što su vijek baterije, izvedba aplikacija i nove <xliff:g id="name" example="LineageOS">%2$s</xliff:g> značajke.</string>
     <string name="services_os_nav_keys_label"><b>Koristite navigacijske tipke na zaslonu</b>umjesto hardverskih tipki.</string>
-    <string name="services_os_privacy_guard"><b>Omogućite Nadzor privatnosti</b> da biste učinili svoje osobne podatke poput kontakata, poruka ili zapisa poziva nedostupnima za novo instalirane aplikacije.</string>
     <string name="setup_unlock">Otključaj</string>
     <string name="setup_device_locked">Uređaj je zaključao korisnik.</string>
     <string name="setup_require_cyanogen_label"><b>Zahtijeva lozinku vašeg računa</b>za korištenje vašim uređajem čak i nakon vraćanja na tvorničke postavke.</string>

res/values-hu/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm"><xliff:g id="name" example="LineageOS">%s</xliff:g>, segítsen a fejlesztésében</string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> a LineageOS részére történő automatikus diagnosztikai és használati adatok küldésével. Ez az információ nem használható az Ön beazonosítására, csupán segítséget nyújt a csapat számára például az akkumulátor használat, alkalmazás teljesítmény, és más új <xliff:g id="name" example="LineageOS">%2$s</xliff:g> funkciók fejlesztésében.</string>
     <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_os_privacy_guard"><b>Engedélyezze az adatvédelmet</b>, hogy a személyes adatai, mint a névjegyek, üzenetek vagy hívásnaplók ne legyenek elérhetőek az újonnan telepített alkalmazások számára</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>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>

res/values-in/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">Membantu meningkatkan <xliff:g id="name" example="LineageOS">%s </xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> dengan mengirim data diagnostik dan penggunaan ke LineageOS secara otomatis. Informasi ini tidak dapat mengidentifikasi Anda, dan hanya berfungsi untuk membantu tim bekerja dengan hal-hal seperti masa pakai baterai, kinerja aplikasi, dan fitur <xliff:g id="name" example="LineageOS">%2$s</xliff:g> yang baru.</string>
     <string name="services_os_nav_keys_label"><b>Digunakan pada tombol navigasi layar</b> bukan tombol perangkat keras.</string>
-    <string name="services_os_privacy_guard"><b>Aktifkan keamanan privasi</b> untuk membuat data pribadi Anda seperti kontak, pesan atau log panggilan menjadi tidak tersedia untuk aplikasi baru yang terpasang</string>
     <string name="setup_unlock">Buka kunci</string>
     <string name="setup_device_locked">Perangkat ini telah dikunci oleh pengguna.</string>
     <string name="setup_require_cyanogen_label"><b>Memerlukan kata sandi akun anda</b> untuk dapat menggunakan perangkat meskipun setelah di setel ulang ke pengaturan pabrik.</string>

res/values-it/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">Contribuisci a migliorare <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> inviando automaticamente dati diagnostici e di consumo agli svilupatori di LineageOS. Queste informazioni non possono essere utilizzate per identificare te ma danno una mano ai team che lavorano su cose come la durata della batteria, performance delle app e nuove funzioni di <xliff:g id="name" example="LineageOS">%2$s</xliff:g>.</string>
     <string name="services_os_nav_keys_label"><b>Usa i pulsanti virtuali a schermo</b> invece di quelli fisici.</string>
-    <string name="services_os_privacy_guard"><b>Attiva Privacy guard</b> per rendere inaccessibili i dati personali come contatti, messaggi o il registro delle chiamate alle nuove app installate</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</b> al fine di utilizzare il dispositivo anche dopo il ripristino di fabbrica.</string>

res/values-iw/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">עזור בשיפור <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> על ידי שליחת נתוני אבחון ושימוש אל LineageOS. מידע זה לא יוכל לשמש בכדי לזהותך, והוא תורם לצוותים העובדים על תחומים כמו חיי סוללה, ביצועים ותכונות חדשות ל־<xliff:g id="name" example="LineageOS">%2$s</xliff:g>.</string>
     <string name="services_os_nav_keys_label"><b>השתמש במקשי הניווט במסך</b> במקום במקשים הפיזיים.</string>
-    <string name="services_os_privacy_guard"><b>הפעל את שומר הפרטיות</b> כדי למנוע גישה לפרטיים האישים שלך מיישומים חדשים</string>
     <string name="setup_unlock">פתיחה</string>
     <string name="setup_device_locked">מכשיר זה ננעל על-ידי המשתמש.</string>
     <string name="setup_require_cyanogen_label"><b>דרוש את סיסמת החשבון שלך</b> כדי להשתמש במכשיר אפילו לאחר איפוס מלא.</string>

res/values-ja/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm"><xliff:g id="name" example="LineageOS">%s</xliff:g>の改善に協力します</string>
     <string name="services_metrics_label">診断と使用状況データを自動的に LineageOS に送信して、<xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g>。この情報は個人を特定するために使用されることはなく、電池持ち、アプリのパフォーマンス、<xliff:g id="name" example="LineageOS">%2$s</xliff:g>の新機能などへの取り組みに活用されます。</string>
     <string name="services_os_nav_keys_label">ハードウェアキーのかわりに<b>スクリーンナビゲーションキーを使用します</b>。</string>
-    <string name="services_os_privacy_guard"><b>プライバシーガードを有効化</b>すると連絡先やメッセージ、通話履歴などの個人情報を新しくインストールしたアプリに渡さないようにできます。</string>
     <string name="setup_unlock">ロック解除</string>
     <string name="setup_device_locked">この端末はユーザーによってロックされています。</string>
     <string name="setup_require_cyanogen_label">工場出荷時の状態にリセットした後でも、この端末を使用するには<b>アカウントのパスワードの入力が必要です</b>。</string>

res/values-ko/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm"><xliff:g id="name" example="LineageOS">%s</xliff:g> 의 개선을 돕기 위해</string>
     <string name="services_metrics_label"><xliff:g id="name" example="LineageOS의 개선을 돕기 위해">%1$s</xliff:g> 진단 및 사용 정보를 LineageOS에 보냅니다. 이 정보로는 사용자를 식별할 수 없으며 배터리 수명, 앱 성능 개선과 <xliff:g id="name" example="LineageOS">%2$s</xliff:g>에 새로운 기능을 추가하는 데 도움이 됩니다.</string>
     <string name="services_os_nav_keys_label">하드웨어 키 대신 <b>화면 상의 내비게이션 키</b>를 사용합니다.</string>
-    <string name="services_os_privacy_guard">새로 설치한 앱에서 연락처, 메시지 또는 통화 기록과 같은 개인 정보를 사용하지 못하도록 <b>프라이버시 가드 활성화</b></string>
     <string name="setup_unlock">잠금 해제</string>
     <string name="setup_device_locked">이 기기는 사용자에 의해 잠겨 있습니다.</string>
     <string name="setup_require_cyanogen_label">공장 초기화 후에도 기기를 사용하려면 <b>계정 비밀번호가 필요합니다</b>.</string>

res/values-nb/strings.xml

@@ -61,7 +61,6 @@
     <string name="services_explanation" product="default">Disse tjenestene utvider funksjonaliteten til telefonen din. Dataene vil bli brukt i samsvar med LineageOS sin <xliff:g id="name" example="personvernspraksis">%s</xliff:g>.</string>
     <string name="services_privacy_policy">Personvern</string>
     <string name="services_os_nav_keys_label"><b>Bruk navigasjonstaster på skjermen </b> istedenfor hardware knapper.</string>
-    <string name="services_os_privacy_guard"><b>Skru på personvernsvakten</b> for å beskytte personvernsopplysninger som kontakter, meldinger eller anropslister fra nylig installerte programmer</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>Krev passord til konto</b> for å bruke enheten etter en fabrikkgjennoppretting.</string>

res/values-nl/strings.xml

@@ -62,7 +62,6 @@
     <string name="services_privacy_policy">Privacybeleid</string>
     <string name="services_help_improve_cm">Help mee met het verbeteren van <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_os_nav_keys_label"><b>On-screen navigatieknoppen</b> gebruiken in plaats van de hardwareknoppen.</string>
-    <string name="services_os_privacy_guard"><b>Privacybescherming inschakelen</b> om uw persoonlijke gegevens zoals contacten, berichten of oproepgeschiedenis niet beschikbaar te maken voor nieuw geïnstalleerde apps</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 accountwachtwoord vereisen</b> om het apparaat te gebruiken, zelfs na terugzetten naar fabrieksinstellingen.</string>

res/values-pl/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">Pomóż ulepszyć <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Pomóż ulepszyć LineageOS">%1$s</xliff:g> zezwalając na automatyczne przesyłanie danych diagnostycznych oraz użytkowania do LineageOS. Te informacje nie będą mogły zostać użyte do identyfikacji i stanowią pomoc dla zespołów pracujących nad czasem pracy baterii, wydajnością aplikacji oraz nowymi <xliff:g id="name" example="LineageOS">%2$s</xliff:g> funkcjami.</string>
     <string name="services_os_nav_keys_label"><b>Użyj ekranowych przycisków nawigacyjnych</b> zamiast klawiszy sprzętowych.</string>
-    <string name="services_os_privacy_guard"><b>Włącz ochronę prywatności</b> aby twoje dane osobiste, takie jak kontakty, wiadomości lub rejestr połączeń nie były dostępne dla nowo zainstalowanych aplikacji</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>Wymagaj hasła do konta</b>, aby korzystać z urządzenia nawet po przywróceniu ustawień fabrycznych.</string>

res/values-pt-rBR/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">Ajude a melhorar o <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> enviando automaticamente dados de diagnóstico e utilização para a equipe do sistema. Esta informação não pode ser usada para identificá-lo e ajuda os desenvolvedores a melhorarem funções e serviços como a duração da bateria, o desempenho das aplicações e o desenvolvimento de novos recursos para o <xliff:g id="name" example="LineageOS">%2$s</xliff:g>.</string>
     <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_os_privacy_guard"><b>Ative a Proteção da Privacidade</b> para tornar dados pessoais como contatos, mensagens ou registro de chamadas indisponíveis para aplicativos recém-instalados</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 de sua conta</b> para usar o dispositivo mesmo depois de restaurar os padrões de fábrica.</string>

res/values-pt-rPT/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">Ajude a melhorar a <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Ajude a melhorar a LineageOS">%1$s</xliff:g> enviando automaticamente dados de diagnóstico e utilização para a LineageOS. Esta informação não pode ser usada para identificá-lo e ajuda as equipas de desenvolvimento a melhorarem coisas como a duração da bateria, o desempenho das aplicações e no desenvolvimento de novas funcionalidades para a <xliff:g id="name" example="LineageOS">%2$s</xliff:g>.</string>
     <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_os_privacy_guard"><b>Ative a Proteção da Privacidade</b> para tornar os seus dados pessoais como contactos, mensagens ou registo de chamadas não disponíveis para aplicações recém-instaladas</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 sua conta</b> para usar o dispositivo mesmo depois da reposição dos dados de fábrica.</string>

res/values-ro/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">Ajutați la îmbunătățirea <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> prin trimiterea automată a statisticilor se utilizare și de utilizare a datelor la LineageOS. Aceste informații nu pot fi utilizate pentru identificarea dvs., ci oferă o mână de ajutor echipei care lucrează la lucruri ca durata bateriei, performanța aplicațiilor și la noile caracteristici <xliff:g id="name" example="LineageOS">%2$s</xliff:g>.</string>
     <string name="services_os_nav_keys_label"><b>Utilizează tastele de navigare de pe ecran</b> în locul tastelor fizice.</string>
-    <string name="services_os_privacy_guard"><b>Activați Gardianul de Intimitate</b> pentru a vă face datele personale precum contactele, mesajele sau istoricul apelurilor indisponibile pentru aplicațiile nou instalate</string>
     <string name="setup_unlock">Deblocare</string>
     <string name="setup_device_locked">Acest dispozitiv a fost blocat de utilizator.</string>
     <string name="setup_require_cyanogen_label"><b>Este necesară parola contului dvs.</b> pentru a vă utiliza dispozitivul după fiecare resetare la datele din fabrică.</string>

res/values-ru/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">Помочь улучшить <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g>, разрешив отправку данных диагностики и использования в LineageOS. Эта информация не может быть использована для вашей идентификации и поможет в работе над повышением автономности, производительности и новыми возможностями <xliff:g id="name" example="LineageOS">%2$s</xliff:g>.</string>
     <string name="services_os_nav_keys_label"><b>Использовать экранные навигационные кнопки</b> вместо аппаратных.</string>
-    <string name="services_os_privacy_guard"><b>Включить Защиту конфиденциальности,</b> чтобы ограничить доступ вновь установленных приложений к вашим персональным данным, таким как контакты, сообщения или журналы вызовов</string>
     <string name="setup_unlock">Разблокировать</string>
     <string name="setup_device_locked">Устройство заблокировано пользователем.</string>
     <string name="setup_require_cyanogen_label"><b>Требовать пароль входа в аккаунт</b> для использования устройства даже после сброса настроек.</string>

res/values-sk/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">Pomôžte vylepšiť <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> automatickým zasielaním diagnostických údajov a údajov o používaní do LineageOS. Tieto informácie sa nepoužijú na vašu identifikáciu, ale pomôžu tímom pracujúcim na výdrži, výkone aplikácií a nových funkciách <xliff:g id="name" example="LineageOS">%2$s</xliff:g>.</string>
     <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_os_privacy_guard"><b>Povoliť Privacy guard</b> aby vaše osobné údaje, napríklad kontakty, správy alebo záznamy hovorov neboli dostupné pre novo nainštalované aplikácie</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</b> na používanie vášho zariadenia aj po obnove továrenských nastavení.</string>

res/values-sl/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">Pomagajte izboljšati <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> s samodejnim pošiljanjem diagnostičnih podatkov in podatkov uporabe LineageOS-a. Ti podatki se ne uporabljajo za vaše prepoznavanje in ekipi pomagajo pri izboljšanju npr. življenjske dobe akumulatorja, zmogljivosti aplikacij in novih značilnosti <xliff:g id="name" example="LineageOS">%2$s</xliff:g>.</string>
     <string name="services_os_nav_keys_label"><b>Uporabite zaslonske tipke za krmarjenje</b> namesto fizičnih tipk.</string>
-    <string name="services_os_privacy_guard"><b>Omogočite Privacy guard</b>, da vaši osebni podatki, kot so stiki, sporočila ali dnevniki klicev ne bodo na voljo na novo nameščenim aplikacijam</string>
     <string name="setup_unlock">Odkleni</string>
     <string name="setup_device_locked">To napravo je zaklenil uporabnik.</string>
     <string name="setup_require_cyanogen_label"><b>Zahtevajte svoje geslo računa</b>, da uporabite svojo napravo tudi po ponastavitvi na tovarniške vrednosti.</string>

res/values-sq/strings.xml

@@ -58,7 +58,6 @@
     <string name="services_help_improve_cm">Ndihmo në përmirësimin e <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> duke dërguar automatikisht të dhëna diagnostikuese si dhe përdorimin tek LineageOS. Ky informacion nuk do të përdoret për identifikimin tënd por i jep një dorë ekipeve të përmirësojnë gjëra si jetëgjatësinë e baterisë, performancën e app, dhe funksionet e reja të <xliff:g id="name" example="LineageOS">%2$s</xliff:g>.</string>
     <string name="services_os_nav_keys_label"><b>Përdor butonat virtualë të lundrimit</b> në vend të butonave fizikë.</string>
-    <string name="services_os_privacy_guard"><b>Aktivizo Mbrojtësin e të Dhënave</b> që të dhënat tuaja personale si kontaktet, mesazhet apo lista e thirrjeve të mos jenë të disponueshme për aplikacionet e reja të instaluara</string>
     <string name="setup_unlock">Zhblloko</string>
     <string name="setup_device_locked">Kjo pajisje është bllokuar nga përdoruesi.</string>
     <string name="setup_require_cyanogen_label"><b>Kërko vendosjen e fjalëkalimit të llogarisë</b> për të përdorur pajisjen edhe pas rikthimit në gjëndjen e fabrikës.</string>

res/values-sr/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">Помозите нам да побољшамо <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> слањем дијагностичких података LineageOS-у. Ове информације вас не могу идентификовати и користе се у циљу побољшања трајања батерије, перформанси и додавања нових <xliff:g id="name" example="LineageOS">%2$s</xliff:g> могућности.</string>
     <string name="services_os_nav_keys_label"><b>Користите навигациону дугмад на екрану</b> уместо физичку.</string>
-    <string name="services_os_privacy_guard"><b>Омогућите заштиту приватности</b> да бисте новим апликацијама ограничили приступ вашим личним подацима — контактима, порукама или евиденцији позива.</string>
     <string name="setup_unlock">Откључај</string>
     <string name="setup_device_locked">Корисник је закључао уређај.</string>
     <string name="setup_require_cyanogen_label"><b>Захтевајте лозинку налога</b> за коришћење уређаја, чак и након враћања фабричких подешавања.</string>

res/values-th/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">ช่วยปรับปรุง <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> โดยการส่งข้อมูลการวินิจฉัยและการใช้งานไปยัง LineageOS โดยอัตโนมัติ ไม่สามารถใช้ข้อมูลนี้ในการระบุตัวคุณและให้ความช่วยเหลือแก่ทีมที่ทำงานเกี่ยวกับสิ่งต่าง ๆ เช่นอายุการใช้งานแบตเตอรี่ ประสิทธิภาพของแอป และคุณสมบัติ <xliff:g id="name" example="LineageOS">%2$s</xliff:g> ใหม่</string>
     <string name="services_os_nav_keys_label"><b>ใช้แถบนำทาง</b> แทนการใช้ปุ่มบนอุปกรณ์</string>
-    <string name="services_os_privacy_guard"><b>เปิดใช้งานความเป็นส่วนตัว</b> เพื่อไม่ให้ข้อมูลส่วนบุคคลของคุณ เช่นรายชื่อติดต่อข้อความหรือบันทึกการโทร จะไม่พร้อมใช้งานสำหรับแอปที่ติดตั้งใหม่</string>
     <string name="setup_unlock">ปลดล็อค</string>
     <string name="setup_device_locked">อุปกรณ์นี้ถูกล็อคโดยผู้ใช้</string>
     <string name="setup_require_cyanogen_label"><b>ต้องใช้รหัสผ่านบัญชีของคุณ</b> เพื่อใช้งานอุปกรณ์ของคุณแม้หลังจากรีเซ็ตเป็นค่าโรงงาน</string>

res/values-tr/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm"><xliff:g id="name" example="LineageOS">%s</xliff:g> geliştirmeye yardımcı olun</string>
     <string name="services_metrics_label">LineageOS\'a tanı ve kullanım verilerini otomatik olarak göndererek <xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g>. Bu bilgiler kimliğinizi ortaya çıkaracak şekilde kullanılmaz ve pil ömrü, uygulama performansı ve yeni <xliff:g id="name" example="LineageOS">%2$s</xliff:g> özellikleri gibi şeylerle uğraşan takımlara yardımcı olur.</string>
     <string name="services_os_nav_keys_label">Donanımsal tuşlar yerine <b>yazılımsal gezinme tuşlarını kullanın</b>.</string>
-    <string name="services_os_privacy_guard">Yeni yüklenecek uygulamaların kişileriniz, mesajlarınız ve arama kaydınızı görmemesi için <b>Gizlilik Koruması\'nı etkinleştir.</b></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>Hesap parolanız</b> cihazınızı sıfırladıktan sonra kullanabilmek için gereklidir.</string>

res/values-uk/strings.xml

@@ -62,7 +62,6 @@
     <string name="services_privacy_policy">Політика Конфіденційності</string>
     <string name="services_os_nav_keys_label"><b>Використовувати навігаційні кнопки на екрані
 </b> замість апаратних.</string>
-    <string name="services_os_privacy_guard"><b>Увімкнути Вартового приватності</b> щоб зробити ваші особисті дані, такі як контакти, повідомлення або журнал викликів не доступними для застосунків, що будуть встановлені</string>
     <string name="setup_unlock">Розблокувати</string>
     <string name="setup_device_locked">Цей пристрій заблоковано користувачем.</string>
     <string name="setup_require_cyanogen_label"><b>Необхідний пароль</b> для використання Вашого пристрою навіть після скидання до заводських налаштувань.</string>

res/values-vi/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">Giúp cải thiện <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> bằng cách tự động gửi dữ liệu chẩn đoán và sử dụng đến LineageOS. Thông tin này không được sử dụng để nhận dạng bạn và giúp nhóm thực hiện những thứ như thời lượng pin, hiệu suất ứng dụng và các tính năng <xliff:g id="name" example="LineageOS">%2$s</xliff:g> mới.</string>
     <string name="services_os_nav_keys_label"><b>Sử dụng các phím điều hướng trên màn hình</b> thay cho các phím cứng.</string>
-    <string name="services_os_privacy_guard"><b>Cho phép bảo vệ sự riêng tư</b> để làm cho dữ liệu cá nhân của bạn như danh bạ, tin nhắn hay nhật ký cuộc gọi không có sẵn cho các ứng dụng mới được cài đặt</string>
     <string name="setup_unlock">Mở khóa</string>
     <string name="setup_device_locked">Thiết bị này đã bị khoá bởi người dùng.</string>
     <string name="setup_require_cyanogen_label"><b>Yêu cầu mật khẩu tài khoản của bạn</b> để sử dụng thiết bị của bạn ngay cả sau khi đặt lại cài đặt gốc.</string>

res/values-zh-rCN/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">帮助改进 <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> 通过自动发送诊断和使用数据给 LineageOS。这些信息不会被用于识别您的身份，而是用于帮助团队致力于诸如电池寿命、应用性能和新 <xliff:g id="name" example="LineageOS">%2$s</xliff:g> 功能。</string>
     <string name="services_os_nav_keys_label"><b>使用虚拟导航键</b>替代实体按键。</string>
-    <string name="services_os_privacy_guard"><b>启用隐私防护</b>使新安装的应用不能获取您的联系人、信息或通话记录等个人数据</string>
     <string name="setup_unlock">解锁</string>
     <string name="setup_device_locked">此设备的持有者锁定了该设备。</string>
     <string name="setup_require_cyanogen_label"><b>需要您的帐户密码</b>以使用您的设备，甚至在重置之后。</string>

res/values-zh-rTW/strings.xml

@@ -63,7 +63,6 @@
     <string name="services_help_improve_cm">協助改善 <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> 經由傳送錯誤報告及使用資料給 LineageOS，這些資料不會用於識別您的身分，而是用於幫助團隊改善電池壽命、應用程式效能和新的 <xliff:g id="name" example="LineageOS">%2$s</xliff:g> 功能。</string>
     <string name="services_os_nav_keys_label"><b>使用虛擬按鍵</b>替代實體按鍵。</string>
-    <string name="services_os_privacy_guard"><b>啟用隱私守衛</b>，使您的個人資料，如聯絡人、訊息或通話記錄無法用於新安裝的應用程式</string>
     <string name="setup_unlock">解鎖</string>
     <string name="setup_device_locked">已被使用者鎖定此裝置。</string>
     <string name="setup_require_cyanogen_label"><b>需要您的帳戶密碼</b> 即可使用您的裝置，即使在重設裝置之後。</string>

res/values/strings.xml

@@ -78,7 +78,6 @@
     <string name="services_help_improve_cm">Help improve <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> by automatically sending diagnostic and usage data to LineageOS. This information can’t be used to identify you and lends a hand to teams working on things like battery life, app performance, and new <xliff:g id="name" example="LineageOS">%2$s</xliff:g> features.</string>
     <string name="services_os_nav_keys_label"><b>Use on screen navigation keys</b> instead of hardware keys.</string>
-    <string name="services_os_privacy_guard"><b>Enable Privacy guard</b> to make your personal data such as contacts, messages or call logs not available for newly installed apps</string>
 
     <string name="setup_unlock">Unlock</string>
     <string name="setup_device_locked">This device has been locked by the user.</string>

src/org/lineageos/setupwizard/BaseSetupWizardActivity.java

@@ -17,9 +17,9 @@
 
 package org.lineageos.setupwizard;
 
-import static com.android.setupwizardlib.util.ResultCodes.RESULT_ACTIVITY_NOT_FOUND;
+import static com.google.android.setupcompat.util.ResultCodes.RESULT_ACTIVITY_NOT_FOUND;
-import static com.android.setupwizardlib.util.ResultCodes.RESULT_RETRY;
+import static com.google.android.setupcompat.util.ResultCodes.RESULT_RETRY;
-import static com.android.setupwizardlib.util.ResultCodes.RESULT_SKIP;
+import static com.google.android.setupcompat.util.ResultCodes.RESULT_SKIP;
 
 import static org.lineageos.setupwizard.SetupWizardApp.ACTION_EMERGENCY_DIAL;
 import static org.lineageos.setupwizard.SetupWizardApp.ACTION_NEXT;
@@ -45,22 +45,24 @@ import android.os.UserHandle;
 import android.os.UserManager;
 import android.util.Log;
 import android.view.View;
+import android.view.ViewTreeObserver;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.android.setupwizard.navigationbar.SetupWizardNavBar;
+import com.google.android.setupdesign.view.NavigationBar;
-import com.android.setupwizard.navigationbar.SetupWizardNavBar.NavigationBarListener;
+import com.google.android.setupdesign.view.NavigationBar.NavigationBarListener;
-import com.android.setupwizardlib.util.SystemBarHelper;
+import com.google.android.setupcompat.util.SystemBarHelper;
-import com.android.setupwizardlib.util.WizardManagerHelper;
+import com.google.android.setupcompat.util.WizardManagerHelper;
 
 import org.lineageos.setupwizard.util.SetupWizardUtils;
 
 import java.util.List;
 
-public abstract class BaseSetupWizardActivity extends Activity implements NavigationBarListener {
+public abstract class BaseSetupWizardActivity extends Activity implements NavigationBarListener,
+        ViewTreeObserver.OnPreDrawListener {
 
     public static final String TAG = BaseSetupWizardActivity.class.getSimpleName();
 
@@ -76,7 +78,11 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
     protected static final int FINGERPRINT_ACTIVITY_REQUEST = 10101;
     protected static final int SCREENLOCK_ACTIVITY_REQUEST = 10102;
 
-    private SetupWizardNavBar mNavigationBar;
+    private static final int IMMERSIVE_FLAGS =
+            View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
+    private int mSystemUiFlags = IMMERSIVE_FLAGS | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION;
+
+    private NavigationBar mNavigationBar;
 
     protected boolean mIsActivityVisible = false;
     protected boolean mIsExiting = false;
@@ -94,6 +100,20 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
         super.onCreate(savedInstanceState);
         mIsPrimaryUser = UserHandle.myUserId() == 0;
         initLayout();
+        mNavigationBar = getNavigationBar();
+        if (mNavigationBar != null) {
+            mNavigationBar.setNavigationBarListener(this);
+            mNavigationBar.addOnLayoutChangeListener((View view,
+                    int left, int top, int right, int bottom,
+                    int oldLeft, int oldTop, int oldRight, int oldBottom) -> {
+                view.requestApplyInsets();
+            });
+            mNavigationBar.setSystemUiVisibility(mSystemUiFlags);
+            // Set the UI flags before draw because the visibility might change in unexpected /
+            // undetectable times, like transitioning from a finishing activity that had a keyboard
+            ViewTreeObserver viewTreeObserver = mNavigationBar.getViewTreeObserver();
+            viewTreeObserver.addOnPreDrawListener(this);
+        }
     }
 
     @Override
@@ -187,16 +207,43 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
     }
 
     @Override
-    public void onNavigationBarCreated(SetupWizardNavBar bar) {
+    public boolean onPreDraw() {
-        mNavigationBar = bar;
+        // View.setSystemUiVisibility checks if the visibility changes before applying them
-        bar.setUseImmersiveMode(true);
+        // so the performance impact is contained
-        bar.getView().addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
+        mNavigationBar.setSystemUiVisibility(mSystemUiFlags);
-            @Override
+        return true;
-            public void onLayoutChange(View view, int left, int top, int right, int bottom,
+    }
-                                       int oldLeft, int oldTop, int oldRight, int oldBottom) {
+
-                view.requestApplyInsets();
+    /**
+     * @return The navigation bar instance in the layout, or null if the layout does not have a
+     *     navigation bar.
+     */
+    public NavigationBar getNavigationBar() {
+        final View view = findViewById(R.id.navigation_bar);
+        return view instanceof NavigationBar ? (NavigationBar) view : null;
+    }
+
+    /**
+     * Sets whether system navigation bar should be hidden.
+     * @param useImmersiveMode True to activate immersive mode and hide the system navigation bar
+     */
+    public void setUseImmersiveMode(boolean useImmersiveMode) {
+        // By default, enable layoutHideNavigation if immersive mode is used
+        setUseImmersiveMode(useImmersiveMode, useImmersiveMode);
+    }
+
+    public void setUseImmersiveMode(boolean useImmersiveMode, boolean layoutHideNavigation) {
+        if (useImmersiveMode) {
+            mSystemUiFlags |= IMMERSIVE_FLAGS;
+            if (layoutHideNavigation) {
+                mSystemUiFlags |= View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION;
+            }
+        } else {
+            mSystemUiFlags &= ~(IMMERSIVE_FLAGS | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
+        }
+        if (mNavigationBar != null) {
+            mNavigationBar.setSystemUiVisibility(mSystemUiFlags);
         }
-        });
     }
 
     protected void setBackDrawable(Drawable drawable) {
@@ -431,7 +478,7 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
 
     protected void applyForwardTransition(int transitionId) {
         if (transitionId == TRANSITION_ID_SLIDE) {
-            overridePendingTransition(R.anim.suw_slide_next_in, R.anim.suw_slide_next_out);
+            overridePendingTransition(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out);
         } else if (transitionId == TRANSITION_ID_FADE) {
             overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
         } else if (transitionId == TRANSITION_ID_DEFAULT) {
@@ -448,7 +495,7 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
 
     protected void applyBackwardTransition(int transitionId) {
         if (transitionId == TRANSITION_ID_SLIDE) {
-            overridePendingTransition(R.anim.suw_slide_back_in, R.anim.suw_slide_back_out);
+            overridePendingTransition(R.anim.sud_slide_back_in, R.anim.sud_slide_back_out);
         } else if (transitionId == TRANSITION_ID_FADE) {
             overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
         } else if (transitionId == TRANSITION_ID_DEFAULT) {

src/org/lineageos/setupwizard/CaptivePortalSetupActivity.java

@@ -131,6 +131,8 @@ public class CaptivePortalSetupActivity extends SubBaseActivity {
                         new CaptivePortal(new ICaptivePortal.Stub() {
                             @Override
                             public void appResponse(int response) {}
+                            @Override
+                            public void logEvent(int eventId, String packageName) {}
                         }));
                 intent.putExtra("status_bar_color",
                         context.getResources().getColor(R.color.primary_dark));

src/org/lineageos/setupwizard/FinishActivity.java

@@ -19,7 +19,6 @@ package org.lineageos.setupwizard;
 
 import static org.lineageos.setupwizard.SetupWizardApp.DISABLE_NAV_KEYS;
 import static org.lineageos.setupwizard.SetupWizardApp.KEY_BUTTON_BACKLIGHT;
-import static org.lineageos.setupwizard.SetupWizardApp.KEY_PRIVACY_GUARD;
 import static org.lineageos.setupwizard.SetupWizardApp.KEY_SEND_METRICS;
 import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
 
@@ -40,7 +39,7 @@ import android.view.View;
 import android.view.ViewAnimationUtils;
 import android.widget.ImageView;
 
-import com.android.setupwizardlib.util.WizardManagerHelper;
+import com.google.android.setupcompat.util.WizardManagerHelper;
 
 import org.lineageos.setupwizard.util.EnableAccessibilityController;
 
@@ -169,7 +168,6 @@ public class FinishActivity extends BaseSetupWizardActivity {
         if (mEnableAccessibilityController != null) {
             mEnableAccessibilityController.onDestroy();
         }
-        handlePrivacyGuard(mSetupWizardApp);
         handleEnableMetrics(mSetupWizardApp);
         handleNavKeys(mSetupWizardApp);
         final WallpaperManager wallpaperManager =
@@ -191,15 +189,6 @@ public class FinishActivity extends BaseSetupWizardActivity {
         }
     }
 
-    private static void handlePrivacyGuard(SetupWizardApp setupWizardApp) {
-        Bundle mPrivacyData = setupWizardApp.getSettingsBundle();
-        if (mPrivacyData != null && mPrivacyData.containsKey(KEY_PRIVACY_GUARD)) {
-            LineageSettings.Secure.putInt(setupWizardApp.getContentResolver(),
-                    LineageSettings.Secure.PRIVACY_GUARD_DEFAULT,
-                    mPrivacyData.getBoolean(KEY_PRIVACY_GUARD) ? 1 : 0);
-        }
-    }
-
     private static void handleNavKeys(SetupWizardApp setupWizardApp) {
         if (setupWizardApp.getSettingsBundle().containsKey(DISABLE_NAV_KEYS)) {
             writeDisableNavkeysOption(setupWizardApp,

src/org/lineageos/setupwizard/LineageSettingsActivity.java

@@ -18,7 +18,6 @@
 package org.lineageos.setupwizard;
 
 import static org.lineageos.setupwizard.SetupWizardApp.DISABLE_NAV_KEYS;
-import static org.lineageos.setupwizard.SetupWizardApp.KEY_PRIVACY_GUARD;
 import static org.lineageos.setupwizard.SetupWizardApp.KEY_SEND_METRICS;
 
 import android.app.Activity;
@@ -41,7 +40,7 @@ import android.view.WindowManagerGlobal;
 import android.widget.CheckBox;
 import android.widget.TextView;
 
-import com.android.setupwizardlib.util.WizardManagerHelper;
+import com.google.android.setupcompat.util.WizardManagerHelper;
 
 import org.lineageos.setupwizard.R;
 
@@ -58,7 +57,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
 
     private CheckBox mMetrics;
     private CheckBox mNavKeys;
-    private CheckBox mPrivacyGuard;
 
     private boolean mSupportsKeyDisabler = false;
 
@@ -74,12 +72,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
         mSetupWizardApp.getSettingsBundle().putBoolean(DISABLE_NAV_KEYS, checked);
     };
 
-    private View.OnClickListener mPrivacyGuardClickListener = view -> {
-        boolean checked = !mPrivacyGuard.isChecked();
-        mPrivacyGuard.setChecked(checked);
-        mSetupWizardApp.getSettingsBundle().putBoolean(KEY_PRIVACY_GUARD, checked);
-    };
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -132,12 +124,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
         } else {
             navKeysRow.setVisibility(View.GONE);
         }
-
-        View privacyGuardRow = findViewById(R.id.privacy_guard);
-        privacyGuardRow.setOnClickListener(mPrivacyGuardClickListener);
-        mPrivacyGuard = (CheckBox) findViewById(R.id.privacy_guard_checkbox);
-        mPrivacyGuard.setChecked(LineageSettings.Secure.getInt(getContentResolver(),
-                LineageSettings.Secure.PRIVACY_GUARD_DEFAULT, 0) == 1);
     }
 
     @Override
@@ -145,7 +131,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
         super.onResume();
         updateDisableNavkeysOption();
         updateMetricsOption();
-        updatePrivacyGuardOption();
     }
 
     @Override
@@ -201,17 +186,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
         }
     }
 
-    private void updatePrivacyGuardOption() {
-        final Bundle bundle = mSetupWizardApp.getSettingsBundle();
-        boolean enabled = LineageSettings.Secure.getInt(getContentResolver(),
-                LineageSettings.Secure.PRIVACY_GUARD_DEFAULT, 0) != 0;
-        boolean checked = bundle.containsKey(KEY_PRIVACY_GUARD) ?
-                bundle.getBoolean(KEY_PRIVACY_GUARD) :
-                enabled;
-        mPrivacyGuard.setChecked(checked);
-        bundle.putBoolean(KEY_PRIVACY_GUARD, checked);
-    }
-
     private static boolean isKeyDisablerSupported(Context context) {
         final LineageHardwareManager hardware = LineageHardwareManager.getInstance(context);
         return hardware.isSupported(LineageHardwareManager.FEATURE_KEY_DISABLE);

src/org/lineageos/setupwizard/SetupWizardActivity.java

@@ -28,7 +28,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 
-import com.android.setupwizardlib.util.WizardManagerHelper;
+import com.google.android.setupcompat.util.WizardManagerHelper;
 
 import org.lineageos.setupwizard.util.SetupWizardUtils;
 import org.lineageos.setupwizard.wizardmanager.WizardManager;

src/org/lineageos/setupwizard/SetupWizardApp.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2013 The CyanogenMod Project
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2019 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,7 +63,6 @@ public class SetupWizardApp extends Application {
     public static final String KEY_SEND_METRICS = "send_metrics";
     public static final String DISABLE_NAV_KEYS = "disable_nav_keys";
     public static final String KEY_BUTTON_BACKLIGHT = "pre_navbar_button_backlight";
-    public static final String KEY_PRIVACY_GUARD = "privacy_guard_default";
 
     public static final int REQUEST_CODE_SETUP_WIFI = 0;
     public static final int REQUEST_CODE_SETUP_CAPTIVE_PORTAL= 4;

src/org/lineageos/setupwizard/SetupWizardExitActivity.java

@@ -26,7 +26,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 
-import com.android.setupwizardlib.util.SystemBarHelper;
+import com.google.android.setupcompat.util.SystemBarHelper;
 
 import org.lineageos.setupwizard.util.PhoneMonitor;
 import org.lineageos.setupwizard.util.SetupWizardUtils;

src/org/lineageos/setupwizard/SimMissingActivity.java

@@ -20,7 +20,7 @@ package org.lineageos.setupwizard;
 import android.os.Bundle;
 import android.widget.ImageView;
 
-import com.android.setupwizardlib.util.ResultCodes;
+import com.google.android.setupcompat.util.ResultCodes;
 
 import org.lineageos.setupwizard.util.PhoneMonitor;
 

src/org/lineageos/setupwizard/SubBaseActivity.java

@@ -19,7 +19,7 @@ package org.lineageos.setupwizard;
 
 import static android.content.Intent.FLAG_ACTIVITY_FORWARD_RESULT;
 
-import static com.android.setupwizardlib.util.ResultCodes.RESULT_ACTIVITY_NOT_FOUND;
+import static com.google.android.setupcompat.util.ResultCodes.RESULT_ACTIVITY_NOT_FOUND;
 
 import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_ACTION_ID;
 import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_SCRIPT_URI;

src/org/lineageos/setupwizard/widget/ScrimInsetsFrameLayout.java

@@ -21,10 +21,11 @@ import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.support.v4.view.ViewCompat;
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
 
+import androidx.core.view.ViewCompat;
+
 import org.lineageos.setupwizard.R;
 
 /**

src/org/lineageos/setupwizard/wizardmanager/WizardManager.java

@@ -26,8 +26,9 @@ import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_RESULT_CODE;
 import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_SCRIPT_URI;
 import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
 
-import com.android.setupwizardlib.util.ResultCodes;
+import com.google.android.setupcompat.util.ResultCodes;
-import com.android.setupwizardlib.util.WizardManagerHelper;
+import com.google.android.setupcompat.util.WizardManagerHelper;
+import com.google.android.setupdesign.util.ThemeHelper;
 
 import org.lineageos.setupwizard.util.SetupWizardUtils;
 
@@ -88,7 +89,7 @@ public class WizardManager extends Activity {
     private void addExtras(Intent intent) {
         intent.putExtra(WizardManagerHelper.EXTRA_USE_IMMERSIVE_MODE, true);
         intent.putExtra(EXTRA_FIRST_RUN, true);
-        intent.putExtra(WizardManagerHelper.EXTRA_THEME, WizardManagerHelper.THEME_MATERIAL_LIGHT);
+        intent.putExtra(WizardManagerHelper.EXTRA_THEME, ThemeHelper.THEME_MATERIAL_LIGHT);
     }
 
     private void doAction(String scriptUri, WizardAction action, Intent extras) {