Update Android.bp

SetupWizard: Add option to skip setup wizard on eng builds
Change-Id: I160e95f7985b60740a94d059506ec5716d85cc41
2025-09-09 04:39:24 -07:00 · 2025-08-15 22:37:46 +00:00 · 2025-08-15 18:36:43 +00:00 · 2025-08-12 14:52:00 +02:00 · 2025-08-01 21:13:53 +00:00 · 2025-07-15 17:08:28 +00:00
59 changed files with 265 additions and 152 deletions
--- a/Android.bp
+++ b/Android.bp
@@ -25,7 +25,6 @@ android_app {
        "setupcompat",
        "setupdesign",
        "SystemUISharedLib",
-        "org.lineageos.platform.internal",
    ],

    libs: ["telephony-common"],
--- a/res/layout-sw600dp/welcome_activity.xml
+++ b/res/layout-sw600dp/welcome_activity.xml
@@ -82,5 +82,12 @@
            android:text="@string/accessibility_settings"
            style="@style/SudGlifButton.Secondary" />

+        <Button
+            android:id="@+id/skip"
+            style="@style/SudGlifButton.Secondary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/skip"
+            android:visibility="gone" />
    </LinearLayout>
 </LinearLayout>
--- a/res/layout-television/welcome_activity.xml
+++ b/res/layout-television/welcome_activity.xml
@@ -82,5 +82,12 @@
            android:text="@string/accessibility_settings"
            style="@style/SudGlifButton.Secondary" />

+        <Button
+            android:id="@+id/skip"
+            style="@style/SudGlifButton.Secondary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/skip"
+            android:visibility="gone" />
    </LinearLayout>
 </LinearLayout>
--- a/res/layout/setup_navigation.xml
+++ b/res/layout/setup_navigation.xml
@@ -52,11 +52,6 @@
                            android:checked="true"
                            style="@style/SudRadioButton" />

-                        <RadioButton
-                            android:id="@+id/radio_two_button"
-                            android:text="@string/two_button_navigation"
-                            style="@style/SudRadioButton" />
-
                        <RadioButton
                            android:id="@+id/radio_sw_keys"
                            android:text="@string/navbar_navigation"
--- a/res/layout/welcome_activity.xml
+++ b/res/layout/welcome_activity.xml
@@ -108,6 +108,19 @@
                android:layout_height="0.0dip"
                android:layout_weight="1.0" />

+            <Button
+                android:id="@+id/skip"
+                style="@style/SudGlifButton.Secondary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/skip"
+                android:visibility="gone" />
+
+            <Space
+                android:layout_width="0.0dip"
+                android:layout_height="0.0dip"
+                android:layout_weight="1.0" />
+
            <Button
                android:id="@id/start"
                style="@style/SudGlifButton.Primary"
--- a/res/raw/wizard_script.xml
+++ b/res/raw/wizard_script.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     SPDX-FileCopyrightText: 2014 Google Inc.
-     SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
+     SPDX-FileCopyrightText: 2017-2025 The LineageOS Project
     SPDX-License-Identifier: Apache-2.0
 -->

@@ -21,8 +21,28 @@
        <result wizard:action="check_user_unlock_dpm_user_complete" wizard:name="dpm_profile_complete" wizard:resultCode="112" />
        <result wizard:action="check_user_unlock_work_setup_interrupted_qr_scan" wizard:name="check_user_unlock_work_setup_interrupted_qr_scan" wizard:resultCode="114" />
        <result wizard:action="check_user_unlock_work_setup_interrupted_consumer_flow" wizard:name="check_user_unlock_work_setup_interrupted_consumer_flow" wizard:resultCode="115" />
+        <result wizard:action="check_user_unlock_nfc" wizard:name="check_user_unlock_nfc" wizard:resultCode="124" />
+        <result wizard:action="check_user_unlock_work_setup_interrupted_nfc_tap" wizard:name="check_user_unlock_work_setup_interrupted_nfc_tap" wizard:resultCode="125" />
+        <result wizard:action="check_user_unlock_fail_provisioning" wizard:name="provisioning_extras_not_saved" wizard:resultCode="128" />
        <result wizard:action="check_user_unlock" />
    </WizardAction>
+    <WizardAction wizard:uri="intent:#Intent;package=com.google.android.setupwizard;action=com.android.setupwizard.CHECK_USER_UNLOCK;end" id="check_user_unlock_fail_provisioning">
+        <result wizard:action="fail_provisioning" />
+    </WizardAction>
+    <WizardAction wizard:uri="intent:#Intent;package=com.google.android.setupwizard;action=com.android.setupwizard.SHOW_PROVISIONING_ERROR;end" id="fail_provisioning" />
+    <WizardAction wizard:uri="intent:#Intent;package=com.google.android.setupwizard;action=com.android.setupwizard.CHECK_USER_UNLOCK;end" id="check_user_unlock_work_setup_interrupted_nfc_tap">
+        <result wizard:action="work_setup_interrupted_nfc_tap" />
+    </WizardAction>
+    <WizardAction wizard:uri="intent:#Intent;package=com.google.android.setupwizard;action=com.google.android.setupwizard.WORK_SETUP_INTERRUPTED;end" id="work_setup_interrupted_nfc_tap">
+        <result wizard:action="nfc_provision_flow" wizard:name="continue_start_nfc_provisioning" wizard:resultCode="1" />
+        <result wizard:action="factory_reset" />
+    </WizardAction>
+    <WizardAction wizard:uri="intent:#Intent;package=com.google.android.setupwizard;action=com.android.setupwizard.CHECK_USER_UNLOCK;end" id="check_user_unlock_nfc">
+        <result wizard:action="nfc_provision_flow" />
+    </WizardAction>
+    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_nfc_provision_flow" id="nfc_provision_flow">
+        <result wizard:action="oem_post_setup" />
+    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;package=com.google.android.setupwizard;action=com.android.setupwizard.CHECK_USER_UNLOCK;end" id="check_user_unlock_work_setup_interrupted_qr_scan" />
    <WizardAction wizard:uri="intent:#Intent;package=com.google.android.setupwizard;action=com.google.android.setupwizard.WORK_SETUP_INTERRUPTED;end" id="work_setup_interrupted_qr_scan">
        <result wizard:action="check_user_unlock_qr" wizard:name="continue_start_qr_scan" wizard:resultCode="1" />
@@ -65,12 +85,14 @@
    <WizardAction wizard:uri="intent:#Intent;package=com.google.android.setupwizard;action=com.google.android.setupwizard.CHECK_FRP;end" id="check_frp" />
    <WizardAction wizard:uri="intent:#Intent;package=com.google.android.setupwizard;action=com.android.setupwizard.CHECK_QUICK_START;end" id="check_quick_start">
        <result wizard:action="quick_start_flow" wizard:name="quick_start" wizard:resultCode="101" />
+        <result wizard:action="connect_and_update" />
    </WizardAction>
    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_quick_start_flow" id="quick_start_flow">
        <result wizard:action="oem_post_setup" />
    </WizardAction>
    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_connect_and_update_flow" id="connect_and_update">
        <result wizard:action="no_network_flow" wizard:name="no_connection" wizard:resultCode="1" />
+        <result wizard:action="no_network_flow" wizard:name="skip_in_esim_only" wizard:resultCode="102" />
    </WizardAction>
    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_zero_touch_flow" id="zero_touch">
        <result wizard:action="post_dpm_user_flow" wizard:name="dpm_user_complete" wizard:resultCode="111" />
@@ -90,6 +112,7 @@
        <result wizard:action="oem_post_setup" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;package=com.google.android.setupwizard;action=com.google.android.setupwizard.TRANSITION_TO_PERSONAL_PROFILE_SETUP;end" id="transition_to_personal_profile_setup">
+        <result wizard:action="no_account_flow" wizard:name="skip_add_personal_account" wizard:resultCode="1" />
        <result wizard:action="add_personal_account_after_work_profile" />
    </WizardAction>
    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_account_flow" id="add_personal_account_after_work_profile">
@@ -98,10 +121,15 @@
    <WizardAction wizard:flow="SetupAsNewFlow" wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_account_flow" id="setup_as_new_flow">
        <result wizard:action="oem_post_setup" />
    </WizardAction>
+    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_no_account_flow" id="no_account_flow">
+        <result wizard:action="oem_post_setup" />
+    </WizardAction>
    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_post_dpm_user_flow" id="post_dpm_user_flow">
        <result wizard:action="oem_post_setup" />
    </WizardAction>
-    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_qr_provision_flow" id="qr_provision_flow" />
+    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_qr_provision_flow" id="qr_provision_flow">
+        <result wizard:action="oem_post_setup" />
+    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;package=org.lineageos.setupwizard;action=org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP;end" id="oem_post_setup">
        <result wizard:action="device_specific" />
    </WizardAction>
--- a/res/raw/wizard_script_user.xml
+++ b/res/raw/wizard_script_user.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     SPDX-FileCopyrightText: 2014 Google Inc.
-     SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
+     SPDX-FileCopyrightText: 2017-2025 The LineageOS Project
     SPDX-License-Identifier: Apache-2.0
 -->

@@ -23,24 +23,23 @@
        <result wizard:action="oem_post_setup" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;package=com.google.android.setupwizard;action=com.android.setupwizard.CHECK_USER_UNLOCK;end" id="check_user_unlock" />
-    <WizardAction wizard:uri="intent:#Intent;package=com.google.android.setupwizard;action=com.google.android.setupwizard.COMPLETE_IN_FLIGHT_UPDATES;end" id="complete_in_flight_updates" />
    <WizardAction wizard:uri="intent:#Intent;package=com.google.android.setupwizard;action=com.android.setupwizard.NETWORK_SETTINGS;end" id="network_settings">
        <result wizard:action="wifi_settings" wizard:name="see_all_wifi" wizard:resultCode="102" />
        <result wizard:action="no_account_flow" wizard:name="skip" wizard:resultCode="1" />
-        <result wizard:action="consolidate_captive_portal" />
+        <result wizard:action="complete_in_flight_updates" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;package=com.google.android.setupwizard;action=com.android.setupwizard.WIFI_SETTINGS;end" id="wifi_settings">
        <result wizard:action="no_account_flow" wizard:name="skip" wizard:resultCode="1" />
    </WizardAction>
-    <WizardAction wizard:uri="intent:#Intent;package=com.google.android.setupwizard;action=com.android.setupwizard.CONSOLIDATE_CAPTIVE_PORTAL;end" id="consolidate_captive_portal">
+    <WizardAction wizard:uri="intent:#Intent;package=com.google.android.setupwizard;action=com.google.android.setupwizard.COMPLETE_IN_FLIGHT_UPDATES;end" id="complete_in_flight_updates" />
+    <WizardAction wizard:uri="intent:#Intent;package=com.google.android.setupwizard;action=com.google.android.setupwizard.PRE_CHECKIN_AND_UPDATE;B.checkCaptivePortal=true;end" id="pre_checkin_and_update">
        <result wizard:action="network_unavailable" wizard:name="timeout" wizard:resultCode="101" />
-    </WizardAction>
-    <WizardAction wizard:uri="intent:#Intent;package=com.google.android.setupwizard;action=com.google.android.setupwizard.PRE_CHECKIN_AND_UPDATE;end" id="pre_checkin_and_update">
-        <result wizard:action="network_timeout" wizard:name="timeout" wizard:resultCode="101" />
        <result wizard:action="post_checkin_and_update" />
    </WizardAction>
-    <WizardAction wizard:uri="intent:#Intent;package=com.google.android.setupwizard;action=com.google.android.setupwizard.NETWORK_TIMEOUT;end" id="network_timeout" />
    <WizardAction wizard:uri="intent:#Intent;package=com.google.android.setupwizard;action=com.google.android.setupwizard.POST_CHECKIN_AND_UPDATE;end" id="post_checkin_and_update">
+        <result wizard:action="search_selector_presync" />
+    </WizardAction>
+    <WizardAction wizard:uri="intent:#Intent;package=com.google.android.apps.setupwizard.searchselector;action=com.google.android.setupwizard.SELECT_SEARCH_ENGINE_PRESYNC;end" id="search_selector_presync">
        <result wizard:action="network_check" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;package=com.google.android.setupwizard;action=com.google.android.setupwizard.NETWORK_CHECK;end" id="network_check">
@@ -58,7 +57,7 @@
    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_rollback_auth_early_update_flow" id="rollback_auth_early_update">
        <result wizard:action="load_account_intent" />
    </WizardAction>
-    <WizardAction wizard:uri="intent:#Intent;package=com.google.android.setupwizard;action=com.google.android.setupwizard.GMS_ACCOUNT_CHECKIN;end" id="gms_account_checkin">
+    <WizardAction wizard:uri="intent:#Intent;package=com.google.android.setupwizard;action=com.google.android.setupwizard.GMS_ACCOUNT_CHECKIN;B.saveUserName=true;end" id="gms_account_checkin">
        <result wizard:action="no_account_flow" wizard:name="skip" wizard:resultCode="1" />
    </WizardAction>
    <WizardAction wizard:flow="UserAccountFlow" wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_user_account_flow" id="account_flow">
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -42,7 +42,6 @@
    <string name="setup_navigation">التنقل</string>
    <string name="navigation_summary">اختر طريقة التنقل المفضلة</string>
    <string name="gesture_navigation">التنقل بالإيماءات</string>
-    <string name="two_button_navigation">التنقل باستخدام زرّين</string>
    <string name="navbar_navigation">التنقل باستخدام ثلاثة أزرار</string>
    <string name="hide_gesture_hint">إخفاء تلميحات التنقل الإيمائي</string>
 </resources>
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -43,7 +43,6 @@
    <string name="setup_navigation">Navegación</string>
    <string name="navigation_summary">Escueyi\'l métodu de navegación preferíu</string>
    <string name="gesture_navigation">Navegación xestual</string>
-    <string name="two_button_navigation">Navegación con dos botones</string>
    <string name="navbar_navigation">Navegación con trés botones</string>
    <string name="hide_gesture_hint">Esconder l\'indicador de la navegación xestual</string>
    <string name="setup_theme">Estilu</string>
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -15,7 +15,7 @@
    <string name="setup_welcome_message"><xliff:g id="name" example="LineageOS">%1$s</xliff:g> xoş gəldiniz</string>
    <string name="setup_managed_profile_welcome_message">İş profilinizi qurun</string>
    <string name="emergency_call">Fövqəladə hal zəngləri</string>
-    <string name="accessibility_settings">Əlçatımlılıq ayarları</string>
+    <string name="accessibility_settings">Erişiləbilənlik ayarları</string>
    <string name="setup_locale">Dil</string>
    <string name="sim_locale_changed">%1$s SIM aşkarlandı</string>
    <string name="setup_sim_missing">SIM kart yoxdur</string>
@@ -25,28 +25,27 @@
    <string name="date_time_summary">Saat qurşağınızı seçin və lazım olsa hazırkı tarix və saatı ayarlayın</string>
    <string name="setup_current_date">Hazırkı tarix</string>
    <string name="setup_current_time">Hazırkı vaxt</string>
-    <string name="intro_restore_title">Tətbiqləri və datanı bərpa et</string>
+    <string name="intro_restore_title">Tətbiqləri və veriləri bərpa et</string>
    <string name="intro_restore_subtitle"><xliff:g id="name" example="LineageOS">%s</xliff:g> və ya başqa bir əməliyyat sistemindən Seedvault nüsxəniz varsa, onu burada bərpa edə bilərsiniz.</string>
    <string name="intro_restore_button">Nüsxədən bərpa et</string>
    <string name="setup_location">Yerləşmə xidmətləri</string>
    <string name="location_access_summary"><b>Yer məlumatlarınızı istəyən tətbiqlərə icazə verin.</b> Bu hazırkı və keçmiş yerləşmənizi ehtiva edə bilər.</string>
-    <string name="location_agps_access_summary">Yerləşmə açıq olduqda, <b>peyk köməkçi datalarını internetdən endirin</b>, bu GPS-in başlatma performansını əhəmiyyətli dərəcədə artıra bilər.</string>
+    <string name="location_agps_access_summary">Yerləşmə açıq olduqda, <b>peyk köməkçi verilərini internetdən endirin</b>, bu GPS-in başlatma performansını əhəmiyyətli dərəcədə artıra bilər.</string>
    <string name="update_recovery_title">Lineage Geri qaytarma Rejimini Güncəllə</string>
    <string name="update_recovery_description">Hər güncəlləmədən sonrakı ilk açılışda Lineage Geri qaytarma rejimini güncəlləyir.</string>
    <string name="update_recovery_warning">Quraşdırma bitən kimi Geri qaytarma rejimi güncəllənəcək. Sağlam qalmasını istəyirsinizsə, bu özəlliyi sıradan çıxardın.</string>
    <string name="update_recovery_setting">ƏS ilə birgə Lineage Geri qaytarma rejimini də güncəllə</string>
    <string name="update_recovery_full_description"><xliff:g id="recovery_update_description">%1$s</xliff:g>\n<xliff:g id="recovery_update_warning">%2$s</xliff:g></string>
    <string name="setup_services">LineageOS özəllikləri</string>
-    <string name="services_pp_explanation">Bu xidmətlər cihazınızın imkanlarını artırır. Datalar, <xliff:g id="name" example="LineageOS">%1$s</xliff:g>un gizlilik siyasətinə uyğun olaraq istifadə ediləcək.</string>
+    <string name="services_pp_explanation">Bu xidmətlər cihazınızın imkanlarını artırır. Verilər, <xliff:g id="name" example="LineageOS">%1$s</xliff:g>un gizlilik siyasətinə uyğun olaraq istifadə ediləcək.</string>
    <string name="services_find_privacy_policy">Gizlilik siyasətini fərqli cihazda <xliff:g id="uri" example="https://lineageos.org/legal">%1$s</xliff:g> ünvanını ziyarət edərək oxuya bilərsiniz</string>
    <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"><xliff:g id="name" example="LineageOS">%2$s</xliff:g>-a diaqnostikanı və istifadə datasıını avtomatik göndərərək <xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g>. Bu məlumatlar, kimliyinizi müəyyənləşdirmək üçün istifadə edilmir və batareya ömrü, tətbiq performansı və yeni <xliff:g id="name" example="LineageOS">%3$s</xliff:g> xüsusiyyətləri kimi işlərlə məşğul olan komandalara kömək edir.</string>
+    <string name="services_metrics_label"><xliff:g id="name" example="LineageOS">%2$s</xliff:g>-a diaqnostikanı və istifadə verilərini avtomatik göndərərək <xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g>. Bu məlumatlar, kimliyinizi müəyyənləşdirmək üçün istifadə edilmir və batareya ömrü, tətbiq performansı və yeni <xliff:g id="name" example="LineageOS">%3$s</xliff:g> xüsusiyyətləri kimi işlərlə məşğul olan komandalara kömək edir.</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_full_description"><xliff:g id="pp_explanation">%1$s</xliff:g>\n<xliff:g id="pp_find">%2$s</xliff:g></string>
    <string name="setup_navigation">Hərəkət</string>
    <string name="navigation_summary">Tərcih edilən naviqasiya üsulunu seçin</string>
    <string name="gesture_navigation">Jest hərəkəti</string>
-    <string name="two_button_navigation">2 düyməli hərəkət</string>
    <string name="navbar_navigation">3 düyməli hərəkət</string>
    <string name="hide_gesture_hint">Jestlə hərəkət məsləhətini gizlət</string>
    <string name="setup_theme">Tema</string>
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -12,13 +12,11 @@
    <string name="setup_welcome_message">Вітаем у <xliff:g id="name" example="LineageOS">%1$s</xliff:g></string>
    <string name="emergency_call">Экстранны выклік</string>
    <string name="setup_locale">Мова</string>
-    <string name="setup_sim_missing">SIM-картка адсутнічае</string>
    <string name="setup_datetime">Дата і час</string>
    <string name="setup_current_date">Бягучая дата</string>
    <string name="setup_current_time">Бягучы час</string>
    <string name="intro_restore_title">Аднавіць праграмы і даныя</string>
    <string name="setup_location">Службы месцазнаходжання</string>
-    <string name="location_access_summary"><b>Дазволіць праграмам, якія запыталі ваш дазвол</b> выкарыстоўваць інфармацыю вашага месцазнаходжання. Гэта можа ўключаць ваша бягучыя і папярэднія месцазнаходжанні.</string>
    <string name="location_agps_access_summary">Калі месцазнаходжанне ўключана, <b>спампуйце даныя дапамогі спадарожнікаў з інтэрнэту</b>, якія могуць значна падвысіць хуткасць запуску GPS.</string>
    <string name="update_recovery_full_description"><xliff:g id="recovery_update_description">%1$s</xliff:g>\n<xliff:g id="recovery_update_warning">%2$s</xliff:g></string>
    <string name="services_os_nav_keys_label"><b>Выкарыстоўваць кнопкі навігацыі на экране</b> замест апаратных.</string>
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -13,6 +13,7 @@
    <string name="ok">Добре</string>
    <string name="loading">Само секунда\u2026</string>
    <string name="setup_welcome_message">Добре дошли в <xliff:g id="name" example="LineageOS">%1$s</xliff:g></string>
+    <string name="setup_managed_profile_welcome_message">Настройте Вашият работен профил</string>
    <string name="emergency_call">Спешни повиквания</string>
    <string name="accessibility_settings">Настройки на достъпност</string>
    <string name="setup_locale">Език</string>
@@ -25,9 +26,11 @@
    <string name="setup_current_date">Днешна дата</string>
    <string name="setup_current_time">Актуално време</string>
    <string name="intro_restore_title">Възстановяване на приложения и данни</string>
+    <string name="intro_restore_subtitle">Ако имате Seedvault резервно копие от <xliff:g id="name" example="LineageOS">%s</xliff:g> или друга ОС, можете да го възстановите тук.</string>
    <string name="intro_restore_button">Възстановяване от архив</string>
    <string name="setup_location">Услуги за местоположение</string>
    <string name="location_access_summary"><b>Разреши приложения, които са поискали разрешение</b> за да използва информацията за вашето местоположение. Това може да включва текущото местоположение и последните места.</string>
+    <string name="location_agps_access_summary">Когато местоположението е включено, <b>изтегли помощна сателитна информация от интернет</b>, за да повиши продуктивността на GPS при стартиране.</string>
    <string name="update_recovery_title">Актуализиране на Lineage Recovery</string>
    <string name="update_recovery_description">Актуализира Lineage Recovery при първо зареждане след всяка актуализация.</string>
    <string name="update_recovery_warning">Recovery ще се актуализира веднага щом завършите настройката. Ако искате да го запазите непокътнат, деактивирайте тази функция.</string>
@@ -43,7 +46,10 @@
    <string name="setup_navigation">Ориентиране</string>
    <string name="navigation_summary">Изберете предпочитан начин за ориентиране</string>
    <string name="gesture_navigation">Жестово ориентиране</string>
-    <string name="two_button_navigation">Ориентиране с два бутона</string>
    <string name="navbar_navigation">Ориентиране с три бутона</string>
    <string name="hide_gesture_hint">Скрий подсказката за жестово ориентиране</string>
+    <string name="setup_theme">Тема</string>
+    <string name="theme_summary">Тъмна тема използва черен фон, за да пести батерия при някои екрани</string>
+    <string name="dark">Тъмен</string>
+    <string name="light">Светъл</string>
 </resources>
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -35,6 +35,5 @@
    <string name="setup_navigation">ন্যাভিগেশন</string>
    <string name="navigation_summary">আপনার পছন্দের ন্যাভিগেশন মাধ্যম বেছে নিন</string>
    <string name="gesture_navigation">জেশচার ন্যাভিগেশন</string>
-    <string name="two_button_navigation">দ্বি-বোতাম ন্যাভিগেশন</string>
    <string name="navbar_navigation">ত্রি-বোতাম ন্যাভিগেশন</string>
 </resources>
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -46,7 +46,6 @@
    <string name="setup_navigation">Navegació</string>
    <string name="navigation_summary">Trieu el mètode de navegació preferit</string>
    <string name="gesture_navigation">Navegació gestual</string>
-    <string name="two_button_navigation">Navegació de 2 botons</string>
    <string name="navbar_navigation">Navegació de 3 botons</string>
    <string name="hide_gesture_hint">Amaga l\'indicador de navegació gestual</string>
    <string name="setup_theme">Tema</string>
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -46,7 +46,6 @@
    <string name="setup_navigation">Navigace</string>
    <string name="navigation_summary">Zvolte preferovanou metodu navigace</string>
    <string name="gesture_navigation">Ovládání gesty</string>
-    <string name="two_button_navigation">Navigace dvěma tlačítky</string>
    <string name="navbar_navigation">Navigace třemi tlačítky</string>
    <string name="hide_gesture_hint">Skrýt napovědy navigačních gest</string>
    <string name="setup_theme">Motiv</string>
--- a/res/values-cy/strings.xml
+++ b/res/values-cy/strings.xml
@@ -44,7 +44,6 @@
    <string name="setup_navigation">Llywio</string>
    <string name="navigation_summary">Dewisa pa ddull llywio sydd well gennyt</string>
    <string name="gesture_navigation">Llywio ag ystumiau</string>
-    <string name="two_button_navigation">Llywio 2-fotwm</string>
    <string name="navbar_navigation">Llywio 3-botwm</string>
    <string name="hide_gesture_hint">Cuddio hintiau llywio ag ystumiau</string>
 </resources>
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -44,7 +44,6 @@
    <string name="setup_navigation">Navigation</string>
    <string name="navigation_summary">Vælg foretrukken navigationsmetode</string>
    <string name="gesture_navigation">Navigering med bevægelser</string>
-    <string name="two_button_navigation">Navigering med to knapper</string>
    <string name="navbar_navigation">Navigering med tre knapper</string>
    <string name="hide_gesture_hint">Skjul bevægelses navigerings hint</string>
 </resources>
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -46,7 +46,6 @@
    <string name="setup_navigation">Navigation</string>
    <string name="navigation_summary">Bevorzugte Steuerungsmethode auswählen</string>
    <string name="gesture_navigation">Steuerung durch Gesten</string>
-    <string name="two_button_navigation">2-Tasten-Steuerung</string>
    <string name="navbar_navigation">3-Tasten-Steuerung</string>
    <string name="hide_gesture_hint">Gestensteuerungshinweis ausblenden</string>
    <string name="setup_theme">Darstellung</string>
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -46,7 +46,6 @@
    <string name="setup_navigation">Πλοήγηση</string>
    <string name="navigation_summary">Επιλογή προτιμώμενης μεθόδου πλοήγησης</string>
    <string name="gesture_navigation">Πλοήγηση με χειρονομίες</string>
-    <string name="two_button_navigation">Πλοήγηση με δύο πλήκτρα</string>
    <string name="navbar_navigation">Πλοήγηση με τρία πλήκτρα</string>
    <string name="hide_gesture_hint">Απόκρυψη υποδείξεων πλοήγησης με χειρονομίες</string>
    <string name="setup_theme">Θέμα</string>
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -46,7 +46,6 @@
    <string name="setup_navigation">Navigation</string>
    <string name="navigation_summary">Choose preferred navigation method</string>
    <string name="gesture_navigation">Gesture navigation</string>
-    <string name="two_button_navigation">2-button navigation</string>
    <string name="navbar_navigation">3-button navigation</string>
    <string name="hide_gesture_hint">Hide gestural navigation hint</string>
    <string name="setup_theme">Theme</string>
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -46,7 +46,6 @@
    <string name="setup_navigation">Navigation</string>
    <string name="navigation_summary">Choose preferred navigation method</string>
    <string name="gesture_navigation">Gesture navigation</string>
-    <string name="two_button_navigation">2-button navigation</string>
    <string name="navbar_navigation">3-button navigation</string>
    <string name="hide_gesture_hint">Hide gestural navigation hint</string>
    <string name="setup_theme">Theme</string>
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -46,7 +46,6 @@
    <string name="setup_navigation">Navigation</string>
    <string name="navigation_summary">Choose preferred navigation method</string>
    <string name="gesture_navigation">Gesture navigation</string>
-    <string name="two_button_navigation">2-button navigation</string>
    <string name="navbar_navigation">3-button navigation</string>
    <string name="hide_gesture_hint">Hide gestural navigation hint</string>
    <string name="setup_theme">Theme</string>
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -46,7 +46,6 @@
    <string name="setup_navigation">Navigation</string>
    <string name="navigation_summary">Choose preferred navigation method</string>
    <string name="gesture_navigation">Gesture navigation</string>
-    <string name="two_button_navigation">2-button navigation</string>
    <string name="navbar_navigation">3-button navigation</string>
    <string name="hide_gesture_hint">Hide gestural navigation hint</string>
    <string name="setup_theme">Theme</string>
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -46,7 +46,6 @@
    <string name="setup_navigation">Navegación</string>
    <string name="navigation_summary">Elegir método de navegación preferido</string>
    <string name="gesture_navigation">Navegación por gestos</string>
-    <string name="two_button_navigation">Navegación con dos botones</string>
    <string name="navbar_navigation">Navegación con tres botones</string>
    <string name="hide_gesture_hint">Ocultar la ayuda de navegación por gestos.</string>
    <string name="setup_theme">Tema</string>
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -46,7 +46,6 @@
    <string name="setup_navigation">پیمایش</string>
    <string name="navigation_summary">روش پیمایش ترجیحی را انتخاب کنید</string>
    <string name="gesture_navigation">پیمایش اشاره‌ای</string>
-    <string name="two_button_navigation">پیمایش ۲ دکمه‌ای</string>
    <string name="navbar_navigation">پیمایش ۳ دکمه‌ای</string>
    <string name="hide_gesture_hint">پنهان کردن نوار اشاره ناوبری</string>
    <string name="setup_theme">پوسته</string>
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -46,7 +46,6 @@
    <string name="setup_navigation">Navigation</string>
    <string name="navigation_summary">Choisir la méthode de navigation préférée</string>
    <string name="gesture_navigation">Navigation gestuelle</string>
-    <string name="two_button_navigation">Navigation à deux boutons</string>
    <string name="navbar_navigation">Navigation à trois boutons</string>
    <string name="hide_gesture_hint">Cacher l\'indice de navigation gestuelle</string>
    <string name="setup_theme">Thème</string>
--- a/res/values-fur-rIT/strings.xml
+++ b/res/values-fur-rIT/strings.xml
@@ -46,7 +46,6 @@
    <string name="setup_navigation">Navigazion</string>
    <string name="navigation_summary">Sielç il metodi di navigazion preferît</string>
    <string name="gesture_navigation">Navigazion a mots</string>
-    <string name="two_button_navigation">Navigazion a 2 botons</string>
    <string name="navbar_navigation">Navigazion a 3 botons</string>
    <string name="hide_gesture_hint">Plate i sugjeriments pe navigazion a mots</string>
    <string name="setup_theme">Teme</string>
--- a/res/values-ga-rIE/strings.xml
+++ b/res/values-ga-rIE/strings.xml
@@ -46,7 +46,6 @@
    <string name="setup_navigation">Nascleanúint</string>
    <string name="navigation_summary">Roghnaigh modh nascleanúna is fearr leat</string>
    <string name="gesture_navigation">Gotha nascleanúint</string>
-    <string name="two_button_navigation">Nascleanúint 2-cnaipe</string>
    <string name="navbar_navigation">Nascleanúint 3-cnaipe</string>
    <string name="hide_gesture_hint">Folaigh leid loingseoireachta gothaí</string>
    <string name="setup_theme">Téama</string>
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -46,7 +46,6 @@
    <string name="setup_navigation">Navigáció</string>
    <string name="navigation_summary">Itt választhatja ki a kívánt navigációs módot</string>
    <string name="gesture_navigation">Navigáció kézmozdulatokkal</string>
-    <string name="two_button_navigation">Kétgombos navigáció</string>
    <string name="navbar_navigation">Háromgombos navigáció</string>
    <string name="hide_gesture_hint">Mozdulatvezérlési navigációs-célsáv elrejtése</string>
    <string name="setup_theme">Téma</string>
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -43,7 +43,6 @@
    <string name="setup_navigation">Navigasi</string>
    <string name="navigation_summary">Pilih metode navigasi yang disukai</string>
    <string name="gesture_navigation">Navigasi gestur</string>
-    <string name="two_button_navigation">Navigasi 2 tombol</string>
    <string name="navbar_navigation">Navigasi 3 tombol</string>
    <string name="hide_gesture_hint">Sembunyikan petunjuk navigasi gestur</string>
    <string name="setup_theme">Tema</string>
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -46,7 +46,6 @@
    <string name="setup_navigation">Flakk</string>
    <string name="navigation_summary">Veldu þá aðferð við flakk sem þú vilt nota</string>
    <string name="gesture_navigation">Bendingastjórnun</string>
-    <string name="two_button_navigation">Tveggja-hnappa stjórnun</string>
    <string name="navbar_navigation">Þriggja-hnappa stjórnun</string>
    <string name="hide_gesture_hint">Fela ábendingu við bendingaflakk</string>
    <string name="setup_theme">Þema</string>
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -46,7 +46,6 @@
    <string name="setup_navigation">Navigazione</string>
    <string name="navigation_summary">Scegli il metodo di navigazione preferito</string>
    <string name="gesture_navigation">Navigazione tramite gesti</string>
-    <string name="two_button_navigation">Navigazione con due pulsanti</string>
    <string name="navbar_navigation">Navigazione con tre pulsanti</string>
    <string name="hide_gesture_hint">Nascondi i suggerimenti per la navigazione tramite gesti</string>
    <string name="setup_theme">Tema</string>
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -46,7 +46,6 @@
    <string name="setup_navigation">ナビゲーション</string>
    <string name="navigation_summary">優先するナビゲーション方法を選択してください</string>
    <string name="gesture_navigation">ジェスチャー ナビゲーション</string>
-    <string name="two_button_navigation">2 ボタン ナビゲーション</string>
    <string name="navbar_navigation">3 ボタン ナビゲーション</string>
    <string name="hide_gesture_hint">ナビゲーションヒントを隠す</string>
    <string name="setup_theme">テーマ</string>
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -46,7 +46,6 @@
    <string name="setup_navigation">სამოძრაო</string>
    <string name="navigation_summary">აირჩიეთ სასურველი ხერხი სამოძრაოდ</string>
    <string name="gesture_navigation">ჟესტებით სამოძრაო</string>
-    <string name="two_button_navigation">2-ღილაკიანი სამოძრაო</string>
    <string name="navbar_navigation">3-ღილაკიანი სამოძრაო</string>
    <string name="hide_gesture_hint">ჟესტებით სამოძრაო მანიშნებლის დამალვა</string>
    <string name="setup_theme">იერსახე</string>
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -46,7 +46,6 @@
    <string name="setup_navigation">탐색</string>
    <string name="navigation_summary">마음에 드는 탐색 방법을 선택하세요</string>
    <string name="gesture_navigation">제스처 탐색</string>
-    <string name="two_button_navigation">2버튼 탐색</string>
    <string name="navbar_navigation">3버튼 탐색</string>
    <string name="hide_gesture_hint">제스처 탐색 도움말 숨기기</string>
    <string name="setup_theme">테마</string>
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -34,7 +34,6 @@
    <string name="setup_navigation">လမ်းညွှန်</string>
    <string name="navigation_summary">သင်အားသာသော လမ်းညွှန်မှုနည်းလမ်းကို ရွေးချယ်ပါ</string>
    <string name="gesture_navigation">လက်ဟန်ဖြင့် လမ်းညွှန်ခြင်း</string>
-    <string name="two_button_navigation">ခလုတ် ၂ ခု ဖြင့် လမ်းညွှန်ခြင်း</string>
    <string name="navbar_navigation">ခလုတ် ၃ ခု ဖြင့် လမ်းညွှန်ခြင်း</string>
    <string name="hide_gesture_hint">လက်ဟန်ဖြင့် လမ်းညွှန်ခြင်းအကူကိုပိတ်မည်</string>
 </resources>
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -46,7 +46,6 @@
    <string name="setup_navigation">Navigatie</string>
    <string name="navigation_summary">Kies de voorkeurs navigatie methode</string>
    <string name="gesture_navigation">Navigatie met gebaren</string>
-    <string name="two_button_navigation">Navigatie met twee knoppen</string>
    <string name="navbar_navigation">Navigatie met drie knoppen</string>
    <string name="hide_gesture_hint">Verberg gebaren navigatiehint</string>
    <string name="setup_theme">Thema</string>
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -46,7 +46,6 @@
    <string name="setup_navigation">Nawigacja w systemie</string>
    <string name="navigation_summary">Wybierz preferowaną metodę nawigacji w systemie</string>
    <string name="gesture_navigation">Nawigacja przy użyciu gestów</string>
-    <string name="two_button_navigation">Nawigacja przy użyciu dwóch przycisków</string>
    <string name="navbar_navigation">Nawigacja przy użyciu trzech przycisków</string>
    <string name="hide_gesture_hint">Ukryj podpowiedź dotyczącą nawigacji gestami</string>
    <string name="setup_theme">Motyw</string>
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -5,14 +5,14 @@
     SPDX-License-Identifier: Apache-2.0
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name">Assistente de configuração</string>
+    <string name="app_name">Assistente de Configuração</string>
    <string name="next">Avançar</string>
    <string name="skip">Pular</string>
    <string name="start">Iniciar</string>
-    <string name="done">Concluído</string>
+    <string name="done">Pronto</string>
    <string name="ok">Ok</string>
-    <string name="loading">Aguarde um segundo\u2026</string>
-    <string name="setup_welcome_message">Bem-vindo ao <xliff:g id="name" example="LineageOS">%1$s</xliff:g></string>
+    <string name="loading">Só um momento\u2026</string>
+    <string name="setup_welcome_message">Boas-vindas ao <xliff:g id="name" example="LineageOS">%1$s</xliff:g></string>
    <string name="setup_managed_profile_welcome_message">Configure seu perfil de trabalho</string>
    <string name="emergency_call">Chamada de emergência</string>
    <string name="accessibility_settings">Configurações de acessibilidade</string>
@@ -30,14 +30,14 @@
    <string name="intro_restore_button">Restaurar backup</string>
    <string name="setup_location">Serviços de localização</string>
    <string name="location_access_summary"><b>Permitir que apps que pediram a sua permissão</b> usem suas informações de localização. Isso pode incluir a sua localização atual bem como localizações anteriores.</string>
-    <string name="location_agps_access_summary">Quando a localização estiver ativada, <b>dados de assistência para satélite são baixados através da internet</b>, o que pode melhorar consideravelmente o desempenho da inicialização do GPS.</string>
+    <string name="location_agps_access_summary">Quando a localização está ativada, <b>dados de assistência para satélite são baixados através da internet</b>, o que pode melhorar consideravelmente o desempenho da inicialização do GPS.</string>
    <string name="update_recovery_title">Atualizar Lineage Recovery</string>
    <string name="update_recovery_description">Atualiza o Lineage Recovery na primeira inicialização após cada atualização.</string>
-    <string name="update_recovery_warning">A recovery será atualizada assim que você terminar a configuração. Se você deseja mantê-la intacta, desative esse recurso.</string>
+    <string name="update_recovery_warning">A recuperação será atualizada assim que você terminar a configuração. Se você deseja mantê-la intacta, desative esse recurso.</string>
    <string name="update_recovery_setting">Atualizar o Lineage Recovery junto com o sistema operacional</string>
    <string name="update_recovery_full_description"><xliff:g id="recovery_update_description">%1$s</xliff:g>\n<xliff:g id="recovery_update_warning">%2$s</xliff:g></string>
-    <string name="setup_services">Recursos LineageOS</string>
-    <string name="services_pp_explanation">Estes serviços trabalham para você, estendendo os recursos do seu dispositivo. Os dados serão usados de acordo com a política de privacidade em <xliff:g id="name" example="LineageOS">%1$s</xliff:g>.</string>
+    <string name="setup_services">Recursos do LineageOS</string>
+    <string name="services_pp_explanation">Estes serviços trabalham para você, estendendo os recursos do seu dispositivo. Os dados serão usados de acordo com a política de privacidade do <xliff:g id="name" example="LineageOS">%1$s</xliff:g>.</string>
    <string name="services_find_privacy_policy">Você pode ler a política de privacidade em outro dispositivo visitando <xliff:g id="uri" example="https://lineageos.org/legal">%1$s</xliff:g></string>
    <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 ao  <xliff:g id="name" example="LineageOS">%2$s</xliff:g>. Esta informação não pode ser usada para identificá-lo e ajuda os desenvolvedores a melhorarem coisas como, a duração da bateria, desempenho de apps e o desenvolvimento de novos recursos para o <xliff:g id="name" example="LineageOS">%3$s</xliff:g>.</string>
@@ -46,7 +46,6 @@
    <string name="setup_navigation">Navegação</string>
    <string name="navigation_summary">Escolha o seu método preferido de navegação</string>
    <string name="gesture_navigation">Navegação por gestos</string>
-    <string name="two_button_navigation">Navegação com dois botões</string>
    <string name="navbar_navigation">Navegação com três botões</string>
    <string name="hide_gesture_hint">Ocultar barra de navegação por gestos</string>
    <string name="setup_theme">Tema</string>
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -46,7 +46,6 @@
    <string name="setup_navigation">Navegação</string>
    <string name="navigation_summary">Escolher método de navegação preferido</string>
    <string name="gesture_navigation">Navegação por gestos</string>
-    <string name="two_button_navigation">Navegação com 2 botões</string>
    <string name="navbar_navigation">Navegação com 3 botões</string>
    <string name="hide_gesture_hint">Ocultar dica de navegação por gestos</string>
    <string name="setup_theme">Tema</string>
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -46,7 +46,6 @@
    <string name="setup_navigation">Navigare</string>
    <string name="navigation_summary">Alegeți metoda preferată de navigare</string>
    <string name="gesture_navigation">Navigare prin gesturi</string>
-    <string name="two_button_navigation">Navigare cu 2 butoane</string>
    <string name="navbar_navigation">Navigare cu 3 butoane</string>
    <string name="hide_gesture_hint">Ascunde indiciile navigării gestuale</string>
    <string name="setup_theme">Temă</string>
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -46,7 +46,6 @@
    <string name="setup_navigation">Навигация</string>
    <string name="navigation_summary">Выберите предпочтительный метод навигации</string>
    <string name="gesture_navigation">Навигация жестами</string>
-    <string name="two_button_navigation">Навигация двумя кнопками</string>
    <string name="navbar_navigation">Навигация тремя кнопками</string>
    <string name="hide_gesture_hint">Скрыть подсказку навигации жестами</string>
    <string name="setup_theme">Тема</string>
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -46,7 +46,6 @@
    <string name="setup_navigation">Krmarjenje</string>
    <string name="navigation_summary">Izberite željeni način krmarjenja</string>
    <string name="gesture_navigation">Krmarjenje s potezami</string>
-    <string name="two_button_navigation">Krmarjenje z dvema gumboma</string>
    <string name="navbar_navigation">Krmarjenje s tremi gumbi</string>
    <string name="hide_gesture_hint">Skrij namig krmarjenja</string>
    <string name="setup_theme">Tema</string>
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -46,7 +46,6 @@
    <string name="setup_navigation">Lundrimi</string>
    <string name="navigation_summary">Zgjidhni metodën e preferuar të navigimit</string>
    <string name="gesture_navigation">Navigimi me gjeste</string>
-    <string name="two_button_navigation">Navigimi me 2 butona</string>
    <string name="navbar_navigation">Navigimi me 3 butona</string>
    <string name="hide_gesture_hint">Fshih këshillën e navigimit gjestik</string>
    <string name="setup_theme">Tema</string>
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -31,7 +31,6 @@
    <string name="setup_navigation">Navigering</string>
    <string name="navigation_summary">Välj önskad navigeringsmetod</string>
    <string name="gesture_navigation">Gestnavigering</string>
-    <string name="two_button_navigation">Navigering med två knappar</string>
    <string name="navbar_navigation">Navigering med tre knappar</string>
    <string name="hide_gesture_hint">Dölj ledtråd för gester</string>
    <string name="setup_theme">Tema</string>
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -7,21 +7,49 @@
 <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="skip">தவிர்க்க</string>
+    <string name="start">தொடங்குக</string>
+    <string name="done">முடிந்தது</string>
    <string name="ok">சரி</string>
-    <string name="loading">வெறும் ஒரு வினாடி\u2026</string>
-    <string name="emergency_call">அவசரகால அழைப்பு</string>
+    <string name="loading">வெறும் ஒரு நொடி\u2026</string>
+    <string name="setup_welcome_message"><xliff:g id="name" example="LineageOS">%1$s</xliff:g> இற்கு நல்வரவு</string>
+    <string name="setup_managed_profile_welcome_message">உமது பணித் தனியமைப்பை அமைக்க</string>
+    <string name="emergency_call">நெருக்கடி அழைப்பு</string>
+    <string name="accessibility_settings">அணுகல்தன்மை அமைப்புகள்</string>
    <string name="setup_locale">மொழி</string>
-    <string name="sim_locale_changed">%1$s SIM கண்டறியப்பட்டது.</string>
-    <string name="setup_sim_missing">SIM கார்டு காணவில்லை</string>
-    <string name="sim_missing_summary" product="tablet">உங்கள் டேப்ளட்டில் ஒரு SIM கார்டு கண்டுபிடிக்கப்படவில்லை. ஒரு SIM கார்டை செருக, உங்கள் சாதனத்துடன் வரும் நெறிமுறைகளை படிக்கவும்.</string>
-    <string name="sim_missing_summary" product="default">உங்கள் தொலைப்பேசியில் ஒரு SIM கார்டு கண்டுபிடிக்கப்படவில்லை. ஒரு SIM கார்டை செருக, உங்கள் சாதனத்துடன் வரும் நெறிமுறைகளை படிக்கவும்.</string>
+    <string name="sim_locale_changed">%1$s SIM கண்டறியப்பட்டது</string>
+    <string name="setup_sim_missing">SIM அட்டை காணவில்லை</string>
+    <string name="sim_missing_summary" product="tablet">உமது தத்தல் கணினியில் SIM அட்டை ஒன்றைக் கண்டுபிடிக்கப்படவில்லை. ஒரு SIM அட்டையைச் செருக, உமது கருவியுடன் வரும் நெறிமுறைகளைப் படிக்க.</string>
+    <string name="sim_missing_summary" product="default">உமது தொலைபேசியில் SIM அட்டை ஒன்றைக் கண்டுபிடிக்கப்படவில்லை. ஒரு SIM அட்டையைச் செருக, உமது கருவியுடன் வரும் நெறிமுறைகளைப் படிக்க.</string>
    <string name="setup_datetime">நாளும் நேரமும்</string>
-    <string name="date_time_summary">உங்கள் நேர மண்டலத்தையும் தேவைப்பட்டால் நடப்பு தேதி மற்றும் நேரத்தையும் அமைக்கவும்</string>
+    <string name="date_time_summary">தேவைப்பட்டால் உமது நேர மண்டலத்தை அமைத்து, நடப்பு நாளையும், நேரத்தையும் சரிசெய்க</string>
    <string name="setup_current_date">நடப்பு நாள்</string>
    <string name="setup_current_time">நடப்பு நேரம்</string>
-    <string name="setup_location">இருப்பிடச் சேவைகள்</string>
-    <string name="location_access_summary">உங்கள் இருப்பிட தகவல்களை பயன்படுத்துவதற்கு <b>உங்களிடம் அனுமதி கேட்ட பயன்பாடுகளை அனுமதிக்கவும்.</b> இது உங்களது நடப்பு இருப்பிடம் மற்றும் முந்தைய இருப்பிடத்தை உள்ள்டக்கலாம்.</string>
-    <string name="services_os_nav_keys_label"><b>வன்பொருள் விசைகளுக்கு பதிலாக திரையிலுள்ள</b> வழிச்செல்லுதல் விசைகளை பயன்படுத்தவும்</string>
+    <string name="intro_restore_title">செயலிகளையும், தரவையும் மீட்டெடுக்க</string>
+    <string name="intro_restore_subtitle">உம்மிடம் <xliff:g id="name" example="LineageOS">%s</xliff:g> அல்லது வேறு ஏதேனும் OS இலிருந்து Seedvault காப்புப்பிரதி இருந்தால், அதை இங்கே மீட்டெடுக்கலாம்.</string>
+    <string name="intro_restore_button">காப்புப்பிரதியிலிருந்து மீட்டமைக்க</string>
+    <string name="setup_location">இருப்பிடப் பணிவிடைகள்</string>
+    <string name="location_access_summary">உமது இருப்பிடத் தகவலைப் பயன்படுத்த, <b>உமது அனுமதி கேட்ட பயன்பாடுகளை அனுமதிக்கவும்.</b> இதில் உமது தற்போதைய இருப்பிடமும் கடந்த கால இருப்பிடங்களும் அடங்கலாம்.</string>
+    <string name="location_agps_access_summary">இருப்பிடம் இயக்கப்பட்டிருக்கும்போது, <b>இணையத்திலிருந்து செயற்கைக்கோள் உதவித் தரவைப் பதிவிறக்கவும்</b>, இது GPS தொடக்க செயற்திறனை பெரிதும் மேம்படுத்தும்.</string>
+    <string name="update_recovery_title">Lineage மீட்டெடுப்பைப் புதுப்பிக்க</string>
+    <string name="update_recovery_description">ஒவ்வொரு புதுப்பித்தலுக்குப் பிறகு முதற்தொடக்கத்தில் Lineage மீட்டெடுப்பைப் புதுப்பிக்கிறது.</string>
+    <string name="update_recovery_warning">நீர் அமைப்பை முடித்தவுடனே மீட்டெடுப்பு புதுப்பிக்கப்படும். அப்படியே வைக்க வேண்டுமானால், இச்சிறப்பியலை முடக்குக.</string>
+    <string name="update_recovery_setting">OS உடன் இணைந்து Lineage மீட்டெடுப்பைப் புதுப்பிக்க</string>
+    <string name="update_recovery_full_description"><xliff:g id="recovery_update_description">%1$s</xliff:g>\n<xliff:g id="recovery_update_warning">%2$s</xliff:g></string>
+    <string name="setup_services">LineageOS சிறப்பியல்புகள்</string>
+    <string name="services_pp_explanation">உமது கருவியின் திறன்களை விரிவாக்க இப்பணிவிடைகள் உமக்காக வேலை செய்கின்றன. <xliff:g id="name" example="LineageOS">%1$s</xliff:g> இன் தனியுரிமைக் கொள்கையின்படி தரவு பயன்படுத்தப்படும்.</string>
+    <string name="services_find_privacy_policy"><xliff:g id="uri" example="https://lineageos.org/legal">%1$s</xliff:g> இதைப் பார்வையிடுவதன் மூலம் மற்றொரு கருவியில் தனியுரிமைக் கொள்கையைப் படிக்கலாம்</string>
+    <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">%2$s</xliff:g> இற்கு அனுப்புவதன் மூலம் <xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g>. இத்தகவலால் உம்மை அடையாளங் காணப்பயன்படுத்த முடியாது. மேலும், மின்கல வாழ்நாள், செயலிச் செயற்திறன், புதிய <xliff:g id="name" example="LineageOS">%3$s</xliff:g> சிறப்பியல்புகள் போன்றவற்றில் பணிபுரியும் குழுக்களுக்கு இஃது உதவும்.</string>
+    <string name="services_os_nav_keys_label">வன்பொருள் விசைகளுக்குப் பதிலாகத் <b>திரையில் வழிசெலுத்தல் விசைகளைப் பயன்படுத்துக</b>.</string>
+    <string name="services_full_description"><xliff:g id="pp_explanation">%1$s</xliff:g>\n<xliff:g id="pp_find">%2$s</xliff:g></string>
+    <string name="setup_navigation">வழிசெலுத்தல்</string>
+    <string name="navigation_summary">விருப்பமான வழிசெலுத்தல் முறையைத் தேர்வுசெய்க</string>
+    <string name="gesture_navigation">மெய்ப்பாடு வழிசெலுத்தல்</string>
+    <string name="navbar_navigation">3-பொத்தான் வழிசெலுத்தல்</string>
+    <string name="hide_gesture_hint">மெய்ப்பாடு வழிசெலுத்தல் குறிப்பை மறைக்க</string>
+    <string name="setup_theme">தோற்றம்</string>
+    <string name="theme_summary">இருள் தோற்றம், சில திரைகளில் மின்கலம் நீண்ட நேரம் நீடிக்கும் வகையில், கருப்புப் பின்னணியைப் பயன்படுத்துகிறது</string>
+    <string name="dark">இருள்</string>
+    <string name="light">வெளிர்</string>
 </resources>
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -13,6 +13,7 @@
    <string name="ok">Tamam</string>
    <string name="loading">Bir saniye\u2026</string>
    <string name="setup_welcome_message"><xliff:g id="name" example="LineageOS">%1$s</xliff:g> hoş geldiniz</string>
+    <string name="setup_managed_profile_welcome_message">İş profilini ayarla</string>
    <string name="emergency_call">Acil durum araması</string>
    <string name="accessibility_settings">Erişilebilirlik ayarları</string>
    <string name="setup_locale">Dil</string>
@@ -25,6 +26,7 @@
    <string name="setup_current_date">Şimdiki tarih</string>
    <string name="setup_current_time">Şimdiki saat</string>
    <string name="intro_restore_title">Uygulamaları ve verileri geri yükleyin</string>
+    <string name="intro_restore_subtitle"><xliff:g id="name" example="LineageOS">%s</xliff:g> veya başka bir işletim sisteminden bir Seedvault yedeğiniz varsa, buradan geri yükleyebilirsiniz.</string>
    <string name="intro_restore_button">Yedekten geri yükle</string>
    <string name="setup_location">Konum servisleri</string>
    <string name="location_access_summary"><b>Konum bilginizi isteyen uygulamalara izin ver.</b> Bu geçerli konumunuzu ve geçmiş konumlarınızı içerebilir.</string>
@@ -44,7 +46,10 @@
    <string name="setup_navigation">Gezinme</string>
    <string name="navigation_summary">Tercih edilen gezinme yöntemini seçin</string>
    <string name="gesture_navigation">Hareketle gezinme</string>
-    <string name="two_button_navigation">2 düğmeli gezinme</string>
    <string name="navbar_navigation">3 düğmeli gezinme</string>
    <string name="hide_gesture_hint">Hareketle gezinme ipucunu gizle</string>
+    <string name="setup_theme">Tema</string>
+    <string name="theme_summary">Karanlık tema, siyah bir arka plan kullanarak bazı ekranlarda pilin daha uzun süre dayanmasına yardımcı olur</string>
+    <string name="dark">Karanlık</string>
+    <string name="light">Aydınlık</string>
 </resources>
--- a/res/values-ug/strings.xml
+++ b/res/values-ug/strings.xml
@@ -9,9 +9,14 @@
    <string name="next">كېيىنكى</string>
    <string name="skip">ئاتلاش</string>
    <string name="start">باشلاش</string>
+    <string name="done">تامام</string>
    <string name="ok">جەزملەش</string>
    <string name="loading">سەل كۈتۈڭ\u2026</string>
+    <string name="setup_welcome_message"><xliff:g id="name" example="LineageOS">%1$s</xliff:g> غا خۇش كەلدىڭىز</string>
+    <string name="setup_managed_profile_welcome_message">خىزمەت سەپلىمە ھۆججىتىڭىزنى تەڭشەڭ</string>
    <string name="emergency_call">جىددىي چاقىرىش</string>
+    <string name="accessibility_settings">قوشۇمچە ئىقتىدار تەڭشىكى</string>
+    <string name="setup_locale">تىل</string>
    <string name="sim_locale_changed">ھازىر %1$s دانە SIM كارتا بايقىدى</string>
    <string name="setup_sim_missing">SIM كارتا يوق</string>
    <string name="sim_missing_summary" product="tablet">تاختا كومپىيوتېرىڭىزدا SIM كارتا بايقىمىدى. تاختا كومپىيوتېر ئىشلىتىش قوللانمىسى بۇيىچە SIM كارتا سېلىڭ.</string>
@@ -20,7 +25,31 @@
    <string name="date_time_summary">ئەگەر لازىم بولسا، ۋاقىت رايونى. چىسلا ۋە ۋاقىتنى تەڭشەڭ</string>
    <string name="setup_current_date">نۆۋەتتىكى چېسلا</string>
    <string name="setup_current_time">نۆۋەتتىكى ۋاقىت</string>
+    <string name="intro_restore_title">ئەپ ۋە سانلىق مەلۇماتنى ئەسلىگە قايتۇر</string>
+    <string name="intro_restore_subtitle">ئەگەر سىزدە <xliff:g id="name" example="LineageOS">%s</xliff:g> ياكى باشقا مەشغۇلات سىستېمىسىنىڭ Seedvault زاپىسى بولسا، بۇ جايدا ئۇنى ئەسلىگە قايتۇرالايسىز.</string>
+    <string name="intro_restore_button">زاپاستىن ئەسلىگە كەلتۈر</string>
    <string name="setup_location">ئورۇن مۇلازىمەتلىرى</string>
    <string name="location_access_summary"><b>سىز ھوقۇق بەرگەن ئەپنىڭ</b> سىزنىڭ ئورۇن ئۇچۇرىڭىزنى ئىشلىتىشكە يول قويۇش، بۇ بەلكىم سىزنىڭ ھازىرقى ۋە ئۆتمۈشتىكى ئۇچۇرىڭىزنى ئۆز ئىچىگە ئېلىشى مۇمكىن.</string>
+    <string name="location_agps_access_summary">ئورۇن ئوچۇق بولغاندا، <b>ئىنتېرنېتتىن سۈنئىي ھەمراھ قوشۇمچە سانلىق مەلۇماتىنى چۈشۈرىدۇ</b>، بۇ GPS نىڭ قوزغىلىش ئۈنۈمىنى زور دەرىجىدە ئۆستۈرىدۇ.</string>
+    <string name="update_recovery_title">Lineage ئەسلىگە كەلتۈرۈشنى يېڭىلا</string>
+    <string name="update_recovery_description">ھەر قېتىم يېڭىلانغاندىن كېيىن تۇنجى قېتىم قوزغالغاندا Lineage ئەسلىگە كەلتۈرۈشنى يېڭىلايدۇ.</string>
+    <string name="update_recovery_warning">ئەسلىگە كەلتۈرۈشنى تەڭشەش تاماملانغان ھامان يېڭىلايدۇ. ئەگەر ئۇنى ساقلاپ قالماقچى بولسىڭىز، بۇ ئىقتىدارنى چەكلەڭ.</string>
+    <string name="update_recovery_setting">Lineage يېڭىلاشنى مەشغۇلات سىستېمىسى بىلەن بىللە يېڭىلايدۇ</string>
+    <string name="update_recovery_full_description"><xliff:g id="recovery_update_description">%1$s</xliff:g>\n<xliff:g id="recovery_update_warning">%2$s</xliff:g></string>
+    <string name="setup_services">LineageOS ئىقتىدارلىرى</string>
+    <string name="services_pp_explanation">بۇ مۇلازىمەتلەر ئۈسكۈنىڭىزنىڭ ئىقتىدارىنى كېڭەيتىش ئۈچۈن خىزمەت قىلىدۇ. سانلىق مەلۇمات <xliff:g id="name" example="LineageOS">%1$s</xliff:g> نىڭ شەخسىيەت تۈزۈمىگە ئاساسەن ئىشلىتىلىدۇ.</string>
+    <string name="services_find_privacy_policy">باشقا ئۈسكۈنىدە <xliff:g id="uri" example="https://lineageos.org/legal">%1$s</xliff:g> نى زىيارەت قىلىپ شەخسىيەت تۈزۈمىنى ئوقۇيالايسىز</string>
+    <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> ئۆزلۈكىدىن دىياگنوز ۋە ئىشلىتىش سانلىق مەلۇماتىنى <xliff:g id="name" example="LineageOS">%2$s</xliff:g> غا يوللايدۇ. بۇ ئۇچۇرلارنى سىزنى پەرقلەندۈرۈشكە ئىشلىتىشكە بولمايدۇ، ئىجادكارلار قوشۇنىنىڭ توكدان ئۆمرى، ئەپ ياخشىلاش ۋە  يېڭى <xliff:g id="name" example="LineageOS">%3$s</xliff:g> ئىقتىدارنى قوشۇش ئوخشاش ئىشلارغا ياردىمى بولىدۇ.</string>
    <string name="services_os_nav_keys_label"><b>مەۋھۇم كونۇپكىنى</b> ھەقىقىي كونۇپكىنىڭ ئورنىغا ئالماشتۇرۇش.</string>
+    <string name="services_full_description"><xliff:g id="pp_explanation">%1$s</xliff:g>\n<xliff:g id="pp_find">%2$s</xliff:g></string>
+    <string name="setup_navigation">يولباشچى</string>
+    <string name="navigation_summary">ياقتۇرىدىغان يول باشلاش ئۇسۇلى تاللىنىدۇ</string>
+    <string name="gesture_navigation">قول ئىشارىتى يولباشچى</string>
+    <string name="navbar_navigation">3-توپچە يولباشچى</string>
+    <string name="hide_gesture_hint">يوشۇرۇن قول ئىشارىتى يولباشچى ئىشارىتى</string>
+    <string name="setup_theme">ئۆرنەك</string>
+    <string name="theme_summary">قاراڭغۇ ئۆرنەك قارا تەگلىك ئىشلىتىپ بەزى ئېكرانلاردا توكداننىڭ سەرپىياتىنى ئازايتىدۇ</string>
+    <string name="dark">قاراڭغۇ</string>
+    <string name="light">يورۇق</string>
 </resources>
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -40,7 +40,6 @@
    <string name="setup_navigation">Навігація</string>
    <string name="navigation_summary">Оберіть бажаний спосіб навігації</string>
    <string name="gesture_navigation">Навігація жестами</string>
-    <string name="two_button_navigation">Навігація двома кнопками</string>
    <string name="navbar_navigation">Навігація трьома кнопками</string>
    <string name="hide_gesture_hint">Ховати панель навігації жестами</string>
 </resources>
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -46,7 +46,6 @@
    <string name="setup_navigation">Điều hướng</string>
    <string name="navigation_summary">Chọn phương pháp điều hướng ưa thích</string>
    <string name="gesture_navigation">Điều hướng bằng cử chỉ</string>
-    <string name="two_button_navigation">Điều hướng 2 nút</string>
    <string name="navbar_navigation">Điều hướng 3 nút</string>
    <string name="hide_gesture_hint">Ẩn gợi ý điều hướng cử chỉ</string>
    <string name="setup_theme">Giao diện</string>
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -46,7 +46,6 @@
    <string name="setup_navigation">导航栏</string>
    <string name="navigation_summary">选择导航栏方式</string>
    <string name="gesture_navigation">手势导航</string>
-    <string name="two_button_navigation">“双按钮”导航</string>
    <string name="navbar_navigation">“三按钮”导航</string>
    <string name="hide_gesture_hint">隐藏手势导航栏</string>
    <string name="setup_theme">主题</string>
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -46,7 +46,6 @@
    <string name="setup_navigation">導航欄</string>
    <string name="navigation_summary">選擇首選的導航方式</string>
    <string name="gesture_navigation">手勢導航</string>
-    <string name="two_button_navigation">透過 2 個按鈕操作系統</string>
    <string name="navbar_navigation">透過 3 個按鈕操作系統</string>
    <string name="hide_gesture_hint">隱藏手勢導航條</string>
    <string name="setup_theme">佈景主題</string>
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -73,7 +73,6 @@
    <string name="setup_navigation">Navigation</string>
    <string name="navigation_summary">Choose preferred navigation method</string>
    <string name="gesture_navigation">Gesture navigation</string>
-    <string name="two_button_navigation">2-button navigation</string>
    <string name="navbar_navigation">3-button navigation</string>
    <string name="hide_gesture_hint">Hide gestural navigation hint</string>

--- a/src/org/lineageos/setupwizard/FinishActivity.java
+++ b/src/org/lineageos/setupwizard/FinishActivity.java
@@ -10,7 +10,6 @@ import static org.lineageos.setupwizard.SetupWizardApp.LOGV;

 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
-import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.res.Resources;
 import android.os.Bundle;
@@ -26,6 +25,8 @@ import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;

+import com.google.android.setupcompat.util.SystemBarHelper;
+
 import org.lineageos.setupwizard.util.SetupWizardUtils;

 public class FinishActivity extends BaseSetupWizardActivity {
@@ -34,10 +35,17 @@ public class FinishActivity extends BaseSetupWizardActivity {

    private final Handler mHandler = new Handler(Looper.getMainLooper());

+    private enum FinishState {
+        NONE,
+        SHOULD_ANIMATE,
+        ANIMATING,
+        FINISHED
+    }
+
    // "Why not just start this activity with an Intent extra?" you might ask. Been there.
    // We need this to affect the theme, and even onCreate is not early enough for that,
-    // so "static volatile boolean" it is. Feel free to rework this if you dare.
-    private static volatile boolean sIsFinishing;
+    // so "static volatile" it is. Feel free to rework this if you dare.
+    private static volatile FinishState sFinishState = FinishState.NONE;

    private View mRootView;
    private Resources.Theme mEdgeToEdgeWallpaperBackgroundTheme;
@@ -45,6 +53,9 @@ public class FinishActivity extends BaseSetupWizardActivity {
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
+
+        Log.i(TAG, "onCreate: sFinishState=" + sFinishState);
+
        overrideActivityTransition(OVERRIDE_TRANSITION_CLOSE, R.anim.translucent_enter,
                R.anim.translucent_exit);
        if (LOGV) {
@@ -73,9 +84,29 @@ public class FinishActivity extends BaseSetupWizardActivity {
            return WindowInsetsCompat.CONSUMED;
        });

-        if (sIsFinishing) {
-            startFinishSequence();
+        if (sFinishState != FinishState.NONE) {
+            disableNavigation();
        }
+
+        switch (sFinishState) {
+            case NONE:
+                break;
+            case SHOULD_ANIMATE:
+                startFinishSequence();
+                break;
+            case FINISHED:
+                Log.e(TAG, "Should not start again when finished!");
+                finish();
+                break;
+            default:
+                Log.w(TAG, "Unexpected onCreate state " + sFinishState);
+                break;
+        }
+    }
+
+    private void disableNavigation() {
+        hideNextButton();
+        SystemBarHelper.setBackButtonVisible(getWindow(), false);
    }

    private void disableActivityTransitions() {
@@ -85,14 +116,14 @@ public class FinishActivity extends BaseSetupWizardActivity {

    @Override
    protected void applyForwardTransition() {
-        if (!sIsFinishing) {
+        if (sFinishState == FinishState.NONE) {
            super.applyForwardTransition();
        }
    }

    @Override
    protected void applyBackwardTransition() {
-        if (!sIsFinishing) {
+        if (sFinishState == FinishState.NONE) {
            super.applyBackwardTransition();
        }
    }
@@ -105,30 +136,44 @@ public class FinishActivity extends BaseSetupWizardActivity {
    @Override
    public Resources.Theme getTheme() {
        Resources.Theme theme = super.getTheme();
-        if (sIsFinishing) {
-            if (mEdgeToEdgeWallpaperBackgroundTheme == null) {
-                theme.applyStyle(R.style.EdgeToEdgeWallpaperBackground, true);
-                mEdgeToEdgeWallpaperBackgroundTheme = theme;
-            }
-            return mEdgeToEdgeWallpaperBackgroundTheme;
+        if (sFinishState == FinishState.NONE) {
+            return theme;
        }
-        return theme;
+        if (mEdgeToEdgeWallpaperBackgroundTheme == null) {
+            theme.applyStyle(R.style.EdgeToEdgeWallpaperBackground, true);
+            mEdgeToEdgeWallpaperBackgroundTheme = theme;
+        }
+        return mEdgeToEdgeWallpaperBackgroundTheme;
    }

    @Override
    public void onNavigateNext() {
-        if (!sIsFinishing) {
-            sIsFinishing = true;
-            startActivity(getIntent());
-            finish();
-            disableActivityTransitions();
+        switch (sFinishState) {
+            case NONE:
+                relaunchAndRunAnimation();
+                break;
+            default:
+                Log.e(TAG, "Unexpected state " + sFinishState + " when navigating next");
        }
-        hideNextButton();
+    }
+
+    private void relaunchAndRunAnimation() {
+        sFinishState = FinishState.SHOULD_ANIMATE;
+        // Relaunching the activity before finishing is the only way currently known to prevent
+        // an out-of-place slide transition from happening, even when disabling transitions, and
+        // regardless of when we disable them. This also means we can't simply call recreate(), but
+        // another reason is that recreate() doesn't seem to reinitialize the theme, which is the
+        // entire point of relaunching - to ensure this activity reveals a wallpaper background.
+        // These theme shenanigans and relaunching were not necessary prior to Android 14 QPR3.
+        startActivity(getIntent());
+        finish();
+        disableActivityTransitions();
    }

    private void startFinishSequence() {
+        sFinishState = FinishState.ANIMATING;
        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED);
-        hideNextButton();
+        disableNavigation();

        // Begin outro animation.
        if (mRootView.isAttachedToWindow()) {
@@ -149,11 +194,21 @@ public class FinishActivity extends BaseSetupWizardActivity {
    }

    private void animateOut() {
+        if (sFinishState != FinishState.ANIMATING) {
+            Log.e(TAG, "animateOut but in " + sFinishState + " phase. How?");
+            return;
+        }
        final int cx = (mRootView.getLeft() + mRootView.getRight()) / 2;
        final int cy = (mRootView.getTop() + mRootView.getBottom()) / 2;
        final float fullRadius = (float) Math.hypot(cx, cy);
-        Animator anim =
-                ViewAnimationUtils.createCircularReveal(mRootView, cx, cy, fullRadius, 0f);
+        Animator anim;
+        try {
+            anim = ViewAnimationUtils.createCircularReveal(mRootView, cx, cy, fullRadius, 0f);
+        } catch (IllegalStateException e) {
+            Log.e(TAG, "Failed to create finish animation", e);
+            finishAfterAnimation();
+            return;
+        }
        anim.setDuration(900);
        anim.addListener(new AnimatorListenerAdapter() {
            @Override
@@ -168,10 +223,15 @@ public class FinishActivity extends BaseSetupWizardActivity {
                    if (LOGV) {
                        Log.v(TAG, "Animation ended");
                    }
-                    SetupWizardUtils.finishSetupWizard(FinishActivity.this);
+                    finishAfterAnimation();
                });
            }
        });
        anim.start();
    }
+
+    private void finishAfterAnimation() {
+        SetupWizardUtils.finishSetupWizard(FinishActivity.this);
+        sFinishState = FinishState.FINISHED;
+    }
 }
--- a/src/org/lineageos/setupwizard/NavigationSettingsActivity.java
+++ b/src/org/lineageos/setupwizard/NavigationSettingsActivity.java
@@ -5,12 +5,9 @@

 package org.lineageos.setupwizard;

-import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON_OVERLAY;
 import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY;
 import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY;

-import static com.android.systemui.shared.recents.utilities.Utilities.isLargeScreen;
-
 import static org.lineageos.internal.util.DeviceKeysConstants.KEY_MASK_APP_SWITCH;
 import static org.lineageos.setupwizard.SetupWizardApp.DISABLE_NAV_KEYS;
 import static org.lineageos.setupwizard.SetupWizardApp.NAVIGATION_OPTION_KEY;
@@ -34,8 +31,6 @@ public class NavigationSettingsActivity extends BaseSetupWizardActivity {

    private SetupWizardApp mSetupWizardApp;

-    private boolean mIsTaskbarEnabled;
-
    private String mSelection = NAV_BAR_MODE_GESTURAL_OVERLAY;

    private CheckBox mHideGesturalHint;
@@ -49,8 +44,6 @@ public class NavigationSettingsActivity extends BaseSetupWizardActivity {
        if (mSetupWizardApp.getSettingsBundle().containsKey(DISABLE_NAV_KEYS)) {
            navBarEnabled = mSetupWizardApp.getSettingsBundle().getBoolean(DISABLE_NAV_KEYS);
        }
-        mIsTaskbarEnabled = LineageSettings.System.getInt(getContentResolver(),
-                LineageSettings.System.ENABLE_TASKBAR, isLargeScreen(this) ? 1 : 0) == 1;

        int deviceKeys = getResources().getInteger(
                org.lineageos.platform.internal.R.integer.config_deviceHardwareKeys);
@@ -67,11 +60,6 @@ public class NavigationSettingsActivity extends BaseSetupWizardActivity {
            available--;
        }

-        if (!SetupWizardUtils.isPackageInstalled(this, NAV_BAR_MODE_2BUTTON_OVERLAY)) {
-            findViewById(R.id.radio_two_button).setVisibility(View.GONE);
-            available--;
-        }
-
        if (!SetupWizardUtils.isPackageInstalled(this, NAV_BAR_MODE_3BUTTON_OVERLAY)) {
            findViewById(R.id.radio_sw_keys).setVisibility(View.GONE);
            available--;
@@ -90,11 +78,6 @@ public class NavigationSettingsActivity extends BaseSetupWizardActivity {
        final RadioGroup radioGroup = findViewById(R.id.navigation_radio_group);
        mHideGesturalHint = findViewById(R.id.hide_navigation_hint);

-        // Hide navigation hint checkbox when taskbar is enabled
-        if (mIsTaskbarEnabled) {
-            mHideGesturalHint.setVisibility(View.GONE);
-        }
-
        radioGroup.setOnCheckedChangeListener((group, checkedId) -> {
            switch (checkedId) {
                case R.id.radio_gesture:
@@ -103,11 +86,6 @@ public class NavigationSettingsActivity extends BaseSetupWizardActivity {
                            .setAnimation(R.raw.lottie_system_nav_fully_gestural);
                    revealHintCheckbox();
                    break;
-                case R.id.radio_two_button:
-                    mSelection = NAV_BAR_MODE_2BUTTON_OVERLAY;
-                    navigationIllustration.setAnimation(R.raw.lottie_system_nav_2_button);
-                    hideHintCheckBox();
-                    break;
                case R.id.radio_sw_keys:
                    mSelection = NAV_BAR_MODE_3BUTTON_OVERLAY;
                    navigationIllustration.setAnimation(R.raw.lottie_system_nav_3_button);
@@ -120,10 +98,6 @@ public class NavigationSettingsActivity extends BaseSetupWizardActivity {
    }

    private void revealHintCheckbox() {
-        if (mIsTaskbarEnabled) {
-            return;
-        }
-
        mHideGesturalHint.animate().cancel();

        if (mHideGesturalHint.getVisibility() == View.VISIBLE) {
@@ -139,10 +113,6 @@ public class NavigationSettingsActivity extends BaseSetupWizardActivity {
    }

    private void hideHintCheckBox() {
-        if (mIsTaskbarEnabled) {
-            return;
-        }
-
        if (mHideGesturalHint.getVisibility() == View.INVISIBLE) {
            return;
        }
@@ -162,12 +132,10 @@ public class NavigationSettingsActivity extends BaseSetupWizardActivity {
    @Override
    protected void onNextPressed() {
        mSetupWizardApp.getSettingsBundle().putString(NAVIGATION_OPTION_KEY, mSelection);
-        if (!mIsTaskbarEnabled) {
-            boolean hideHint = mHideGesturalHint.isChecked();
-            LineageSettings.System.putIntForUser(getContentResolver(),
-                    LineageSettings.System.NAVIGATION_BAR_HINT, hideHint ? 0 : 1,
-                    UserHandle.USER_CURRENT);
-        }
+        boolean hideHint = mHideGesturalHint.isChecked();
+        LineageSettings.System.putIntForUser(getContentResolver(),
+                LineageSettings.System.NAVIGATION_BAR_HINT, hideHint ? 0 : 1,
+                UserHandle.USER_CURRENT);
        super.onNextPressed();
    }

--- a/src/org/lineageos/setupwizard/NetworkSetupActivity.java
+++ b/src/org/lineageos/setupwizard/NetworkSetupActivity.java
@@ -15,7 +15,6 @@ import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_PREFS_SHOW_SKIP;
 import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_PREFS_SHOW_SKIP_TV;

 import android.content.Intent;
-import android.os.Bundle;

 import org.lineageos.setupwizard.util.SetupWizardUtils;

--- a/src/org/lineageos/setupwizard/WelcomeActivity.java
+++ b/src/org/lineageos/setupwizard/WelcomeActivity.java
@@ -10,6 +10,7 @@ import static org.lineageos.setupwizard.SetupWizardApp.ACTION_EMERGENCY_DIAL;

 import android.content.Intent;
 import android.os.Bundle;
+import android.os.Build;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
@@ -36,6 +37,7 @@ public class WelcomeActivity extends SubBaseActivity {
        setNextText(R.string.start);
        Button startButton = findViewById(R.id.start);
        Button emergButton = findViewById(R.id.emerg_dialer);
+        Button skipButton = findViewById(R.id.skip);
        startButton.setOnClickListener(view -> onNextPressed());
        findViewById(R.id.launch_accessibility)
                .setOnClickListener(
@@ -60,6 +62,13 @@ public class WelcomeActivity extends SubBaseActivity {
            welcomeTitle.setText(getString(R.string.setup_welcome_message,
                    getString(R.string.os_name)));
        }
+
+        if (Build.TYPE.equals("eng")) {
+            skipButton.setVisibility(View.VISIBLE);
+            skipButton.setOnClickListener(v -> {
+                SetupWizardUtils.finishSetupWizard(WelcomeActivity.this);
+            });
+        }
    }

    @Override
--- a/src/org/lineageos/setupwizard/backup/RestoreIntroActivity.java
+++ b/src/org/lineageos/setupwizard/backup/RestoreIntroActivity.java
@@ -10,11 +10,11 @@ import static com.google.android.setupcompat.util.ResultCodes.RESULT_ACTIVITY_NO

 import static org.lineageos.setupwizard.SetupWizardApp.ACTION_RESTORE_FROM_BACKUP;

-import androidx.activity.result.ActivityResult;
-
 import android.content.Intent;
 import android.os.Bundle;

+import androidx.activity.result.ActivityResult;
+
 import org.lineageos.setupwizard.R;
 import org.lineageos.setupwizard.SubBaseActivity;

--- a/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
+++ b/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
@@ -50,14 +50,15 @@ import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.util.Log;

+import lineageos.hardware.LineageHardwareManager;
+import lineageos.providers.LineageSettings;
+
 import org.lineageos.setupwizard.BaseSetupWizardActivity;
 import org.lineageos.setupwizard.SetupWizardApp;

 import java.io.File;
 import java.util.List;

-import lineageos.providers.LineageSettings;
-
 public class SetupWizardUtils {

    private static final String TAG = SetupWizardUtils.class.getSimpleName();
@@ -320,6 +321,9 @@ public class SetupWizardUtils {
            LineageSettings.System.putIntForUser(context.getContentResolver(),
                    LineageSettings.System.FORCE_SHOW_NAVBAR, enabled ? 1 : 0,
                    UserHandle.USER_CURRENT);
+
+            final LineageHardwareManager hardware = LineageHardwareManager.getInstance(context);
+            hardware.set(LineageHardwareManager.FEATURE_KEY_DISABLE, enabled);
        }
    }
Author	SHA1	Message	Date
oxmc	db97e0f017	Update Android.bp	2025-09-09 04:39:24 -07:00
Inhishonor	bf0afd2ffc	SetupWizard: Add option to skip setup wizard on eng builds Change-Id: I160e95f7985b60740a94d059506ec5716d85cc41	2025-08-15 22:37:46 +00:00
LineageOS Infra	ff8446a504	Automatic translation import Change-Id: I0fb0500343ce9da2e9d8da6f43e56c3fc31a6a68	2025-08-15 18:36:43 +00:00
LuK1337	00fff59802	SetupWizard: Update wizard scripts for 15 Change-Id: Ia946f40bd1118f5eed88de9ff789048485b9e662	2025-08-12 14:52:00 +02:00
LineageOS Infra	06bff7057e	Automatic translation import Change-Id: I1e6e030ce360520ca9b86eaa96542948ce5a6846	2025-08-01 21:13:53 +00:00
LineageOS Infra	c5e8e2cd05	Automatic translation import Change-Id: I4132ca54019a0c9e38a2309f1602c26ce262d75e	2025-07-15 17:08:28 +00:00
LineageOS Infra	c881f511bb	Automatic translation import Change-Id: Ib208ca6ff9c02be5df4931a40a19c4fd65afc355	2025-06-15 14:13:42 +00:00
LineageOS Infra	ffa77d88a0	Automatic translation import Change-Id: I16393162e7993f8b33741921675a72ef99ad51f2	2025-05-01 16:33:26 +00:00
LineageOS Infra	d2781869ea	Automatic translation import Change-Id: If27f457717647152a797316ed5ac7486449e1964	2025-04-15 13:55:31 +00:00
LineageOS Infra	1813dd7ac7	Automatic translation import Change-Id: I7c20858068c3943071c3e35c9aac00ba2f9df0ef	2025-04-07 16:25:35 +00:00
Tommy Webb	bd87362c56	FinishActivity: Also hide Back button At the point of no return, also hide the Back button, not just Next. Change-Id: Ic7b2bf443306b49d7771eaf69e6fdede3fb41fa9	2025-03-28 07:59:12 +00:00
Tommy Webb	6d0cc50670	FinishActivity: Don't crash if exit animation fails somehow Change-Id: Iaf15de9db82e625ecbbf1cb63d2e9f93b8c1625f	2025-03-28 07:59:12 +00:00
Tommy Webb	3a5b46f9a0	FinishActivity: Track state of finish process * Keep track of the state of the finish process to ensure things happen when expected and as expected. Helps with debugging. * A little refactoring and additional comments. Change-Id: Ia9a70cb2148c9870ccffc15f1de3dae927b2710d	2025-03-28 07:59:12 +00:00
LuK1337	94eec15634	SetupWizard: Set FEATURE_KEY_DISABLE too Change-Id: I44e2dc6958c949a489d1a4a4d458cc0b728d5db6	2025-03-27 23:53:16 +08:00
Michael Bestas	01e4669a68	SetupWizard: Cleanup imports find . -name "*.java" \| xargs java -jar \ ~/bin/google-java-format-1.25.2-all-deps.jar \ --aosp --fix-imports-only --replace Change-Id: I1cb284de8f9c7de6c12ddabc826f8371e23d90cf	2025-03-26 11:17:27 +02:00
Michael Bestas	81353f65bc	SetupWizard: Remove 2 button nav leftovers Change-Id: I1883a6936b1a17917d1655d15b6c5bf04492a30c	2025-03-25 19:44:28 +02:00
LuK1337	78e7d4e6d0	Revert "Hide navigation hint checkbox when taskbar is enabled" This reverts commit `a5ba5dfaad`. Change-Id: I567fb5dfaa8d937892b9333dd518ce30a9a4949b	2025-03-24 15:17:14 +01:00