From 81353f65bc309ae1626d7448b81e9f9bba75c7a5 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Tue, 25 Mar 2025 19:44:28 +0200
Subject: [PATCH] SetupWizard: Remove 2 button nav leftovers

Change-Id: I1883a6936b1a17917d1655d15b6c5bf04492a30c
---
 res/layout/setup_navigation.xml                       |  5 -----
 res/values/strings.xml                                |  1 -
 .../setupwizard/NavigationSettingsActivity.java       | 11 -----------
 3 files changed, 17 deletions(-)

diff --git a/res/layout/setup_navigation.xml b/res/layout/setup_navigation.xml
index 1aa4d5c4..f89de6b2 100644
--- 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"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index fec0e846..a46e1d25 100644
--- 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>
 
diff --git a/src/org/lineageos/setupwizard/NavigationSettingsActivity.java b/src/org/lineageos/setupwizard/NavigationSettingsActivity.java
index a39389cf..3beeba18 100644
--- a/src/org/lineageos/setupwizard/NavigationSettingsActivity.java
+++ b/src/org/lineageos/setupwizard/NavigationSettingsActivity.java
@@ -5,7 +5,6 @@
 
 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;
 
@@ -63,11 +62,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--;
@@ -94,11 +88,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);