Automatic translation import

Change-Id: If941b445a9e36f86f1d2a15db85804d33d9ca2d7

Android.bp

@@ -25,6 +25,7 @@ android_app {
         "setupcompat",
         "setupdesign",
         "SystemUISharedLib",
+        "org.lineageos.platform.internal",
     ],
 
     libs: ["telephony-common"],

res/layout-sw600dp/welcome_activity.xml

@@ -82,12 +82,5 @@
             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>

res/layout-television/welcome_activity.xml

@@ -82,12 +82,5 @@
             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>

res/layout/setup_navigation.xml

@@ -52,6 +52,11 @@
                             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"

res/layout/welcome_activity.xml

@@ -108,19 +108,6 @@
                 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"

res/raw/wizard_script.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      SPDX-FileCopyrightText: 2014 Google Inc.
-     SPDX-FileCopyrightText: 2017-2025 The LineageOS Project
+     SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 
@@ -21,28 +21,8 @@
         <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" />
@@ -85,14 +65,12 @@
     <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" />
@@ -112,7 +90,6 @@
         <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">
@@ -121,15 +98,10 @@
     <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>

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-2025 The LineageOS Project
+     SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 
@@ -23,23 +23,24 @@
         <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="complete_in_flight_updates" />
+        <result wizard:action="consolidate_captive_portal" />
     </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.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.CONSOLIDATE_CAPTIVE_PORTAL;end" id="consolidate_captive_portal">
-    <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">
@@ -57,7 +58,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;B.saveUserName=true;end" id="gms_account_checkin">
+    <WizardAction wizard:uri="intent:#Intent;package=com.google.android.setupwizard;action=com.google.android.setupwizard.GMS_ACCOUNT_CHECKIN;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">

res/values-ar/strings.xml

@@ -42,6 +42,7 @@
     <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>

res/values-ast-rES/strings.xml

@@ -43,6 +43,7 @@
     <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>

res/values-az/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-bg/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-bn/strings.xml

@@ -35,5 +35,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>
 </resources>

res/values-ca/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-cs/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-cy/strings.xml

@@ -44,6 +44,7 @@
     <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>

res/values-da/strings.xml

@@ -44,6 +44,7 @@
     <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>

res/values-de/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-el/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-en-rAU/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-en-rCA/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-en-rGB/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-en-rIN/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-es/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-fa/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-fr/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-fur-rIT/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-ga-rIE/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-hu/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-in/strings.xml

@@ -43,6 +43,7 @@
     <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>

res/values-is/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-it/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-ja/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-ka/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-ko/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-my/strings.xml

@@ -34,6 +34,7 @@
     <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>

res/values-nl/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-pl/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-pt-rBR/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-pt-rPT/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-ro/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-ru/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-sl/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-sq/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-sv/strings.xml

@@ -31,6 +31,7 @@
     <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>

res/values-ta/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-tr/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-ug/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-uk/strings.xml

@@ -40,6 +40,7 @@
     <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>

res/values-vi/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-zh-rCN/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values-zh-rTW/strings.xml

@@ -46,6 +46,7 @@
     <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>

res/values/strings.xml

@@ -73,6 +73,7 @@
     <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>
 

src/org/lineageos/setupwizard/FinishActivity.java

@@ -10,6 +10,7 @@ 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;
@@ -25,8 +26,6 @@ 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 {
@@ -35,17 +34,10 @@ 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" it is. Feel free to rework this if you dare.
+    // so "static volatile boolean" it is. Feel free to rework this if you dare.
-    private static volatile FinishState sFinishState = FinishState.NONE;
+    private static volatile boolean sIsFinishing;
 
     private View mRootView;
     private Resources.Theme mEdgeToEdgeWallpaperBackgroundTheme;
@@ -53,9 +45,6 @@ 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) {
@@ -84,31 +73,11 @@ public class FinishActivity extends BaseSetupWizardActivity {
             return WindowInsetsCompat.CONSUMED;
         });
 
-        if (sFinishState != FinishState.NONE) {
+        if (sIsFinishing) {
-            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() {
         overrideActivityTransition(OVERRIDE_TRANSITION_OPEN, 0, 0);
         overrideActivityTransition(OVERRIDE_TRANSITION_CLOSE, 0, 0);
@@ -116,14 +85,14 @@ public class FinishActivity extends BaseSetupWizardActivity {
 
     @Override
     protected void applyForwardTransition() {
-        if (sFinishState == FinishState.NONE) {
+        if (!sIsFinishing) {
             super.applyForwardTransition();
         }
     }
 
     @Override
     protected void applyBackwardTransition() {
-        if (sFinishState == FinishState.NONE) {
+        if (!sIsFinishing) {
             super.applyBackwardTransition();
         }
     }
@@ -136,44 +105,30 @@ public class FinishActivity extends BaseSetupWizardActivity {
     @Override
     public Resources.Theme getTheme() {
         Resources.Theme theme = super.getTheme();
-        if (sFinishState == FinishState.NONE) {
+        if (sIsFinishing) {
-            return theme;
-        }
             if (mEdgeToEdgeWallpaperBackgroundTheme == null) {
                 theme.applyStyle(R.style.EdgeToEdgeWallpaperBackground, true);
                 mEdgeToEdgeWallpaperBackgroundTheme = theme;
             }
             return mEdgeToEdgeWallpaperBackgroundTheme;
         }
+        return theme;
+    }
 
     @Override
     public void onNavigateNext() {
-        switch (sFinishState) {
+        if (!sIsFinishing) {
-            case NONE:
+            sIsFinishing = true;
-                relaunchAndRunAnimation();
-                break;
-            default:
-                Log.e(TAG, "Unexpected state " + sFinishState + " when navigating next");
-        }
-    }
-
-    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();
         }
+        hideNextButton();
+    }
 
     private void startFinishSequence() {
-        sFinishState = FinishState.ANIMATING;
         setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED);
-        disableNavigation();
+        hideNextButton();
 
         // Begin outro animation.
         if (mRootView.isAttachedToWindow()) {
@@ -194,21 +149,11 @@ 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;
+        Animator anim =
-        try {
+                ViewAnimationUtils.createCircularReveal(mRootView, cx, cy, fullRadius, 0f);
-            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
@@ -223,15 +168,10 @@ public class FinishActivity extends BaseSetupWizardActivity {
                     if (LOGV) {
                         Log.v(TAG, "Animation ended");
                     }
-                    finishAfterAnimation();
+                    SetupWizardUtils.finishSetupWizard(FinishActivity.this);
                 });
             }
         });
         anim.start();
     }
-
-    private void finishAfterAnimation() {
-        SetupWizardUtils.finishSetupWizard(FinishActivity.this);
-        sFinishState = FinishState.FINISHED;
-    }
 }

src/org/lineageos/setupwizard/NavigationSettingsActivity.java

@@ -5,9 +5,12 @@
 
 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;
@@ -31,6 +34,8 @@ public class NavigationSettingsActivity extends BaseSetupWizardActivity {
 
     private SetupWizardApp mSetupWizardApp;
 
+    private boolean mIsTaskbarEnabled;
+
     private String mSelection = NAV_BAR_MODE_GESTURAL_OVERLAY;
 
     private CheckBox mHideGesturalHint;
@@ -44,6 +49,8 @@ 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);
@@ -60,6 +67,11 @@ 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--;
@@ -78,6 +90,11 @@ 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:
@@ -86,6 +103,11 @@ 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);
@@ -98,6 +120,10 @@ public class NavigationSettingsActivity extends BaseSetupWizardActivity {
     }
 
     private void revealHintCheckbox() {
+        if (mIsTaskbarEnabled) {
+            return;
+        }
+
         mHideGesturalHint.animate().cancel();
 
         if (mHideGesturalHint.getVisibility() == View.VISIBLE) {
@@ -113,6 +139,10 @@ public class NavigationSettingsActivity extends BaseSetupWizardActivity {
     }
 
     private void hideHintCheckBox() {
+        if (mIsTaskbarEnabled) {
+            return;
+        }
+
         if (mHideGesturalHint.getVisibility() == View.INVISIBLE) {
             return;
         }
@@ -132,10 +162,12 @@ 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);
+        }
         super.onNextPressed();
     }
 

src/org/lineageos/setupwizard/NetworkSetupActivity.java

@@ -15,6 +15,7 @@ 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;
 

src/org/lineageos/setupwizard/WelcomeActivity.java

@@ -10,7 +10,6 @@ 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;
@@ -37,7 +36,6 @@ 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(
@@ -62,13 +60,6 @@ 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

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;
 

src/org/lineageos/setupwizard/util/SetupWizardUtils.java

@@ -50,15 +50,14 @@ 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();
@@ -321,9 +320,6 @@ 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);
         }
     }