Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 81353f65 authored by Michael Bestas's avatar Michael Bestas
Browse files

SetupWizard: Remove 2 button nav leftovers 

Change-Id: I1883a6936b1a17917d1655d15b6c5bf04492a30c
parent 78e7d4e6

res/layout/setup_navigation.xml

+0 −5
Original line number Diff line number Diff line
@@ -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"

res/values/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -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>

src/org/lineageos/setupwizard/NavigationSettingsActivity.java

+0 −11
Original line number Diff line number Diff line
@@ -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);