PawletOS/lineageos_setupwizard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SetupWizard: Remove 2 button nav leftovers

Browse Source 
Change-Id: I1883a6936b1a17917d1655d15b6c5bf04492a30c
This commit is contained in:
Michael Bestas
2025-03-25 19:44:28 +02:00
parent 78e7d4e6d0
commit 81353f65bc
3 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/layout/setup_navigation.xml
View File

@@ -52,11 +52,6 @@
android:checked="true" android:checked="true"
style="@style/SudRadioButton" /> style="@style/SudRadioButton" />
<RadioButton
android:id="@+id/radio_two_button"
android:text="@string/two_button_navigation"
style="@style/SudRadioButton" />
<RadioButton <RadioButton
android:id="@+id/radio_sw_keys" android:id="@+id/radio_sw_keys"
android:text="@string/navbar_navigation" android:text="@string/navbar_navigation"

1
res/values/strings.xml
View File

@@ -73,7 +73,6 @@
<string name="setup_navigation">Navigation</string> <string name="setup_navigation">Navigation</string>
<string name="navigation_summary">Choose preferred navigation method</string> <string name="navigation_summary">Choose preferred navigation method</string>
<string name="gesture_navigation">Gesture navigation</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="navbar_navigation">3-button navigation</string>
<string name="hide_gesture_hint">Hide gestural navigation hint</string> <string name="hide_gesture_hint">Hide gestural navigation hint</string>

11
src/org/lineageos/setupwizard/NavigationSettingsActivity.java
View File

@@ -5,7 +5,6 @@
package org.lineageos.setupwizard; 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_3BUTTON_OVERLAY;
import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY; import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY;
@@ -63,11 +62,6 @@ public class NavigationSettingsActivity extends BaseSetupWizardActivity {
available--; 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)) { if (!SetupWizardUtils.isPackageInstalled(this, NAV_BAR_MODE_3BUTTON_OVERLAY)) {
findViewById(R.id.radio_sw_keys).setVisibility(View.GONE); findViewById(R.id.radio_sw_keys).setVisibility(View.GONE);
available--; available--;
@@ -94,11 +88,6 @@ public class NavigationSettingsActivity extends BaseSetupWizardActivity {
.setAnimation(R.raw.lottie_system_nav_fully_gestural); .setAnimation(R.raw.lottie_system_nav_fully_gestural);
revealHintCheckbox(); revealHintCheckbox();
break; 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: case R.id.radio_sw_keys:
mSelection = NAV_BAR_MODE_3BUTTON_OVERLAY; mSelection = NAV_BAR_MODE_3BUTTON_OVERLAY;
navigationIllustration.setAnimation(R.raw.lottie_system_nav_3_button); navigationIllustration.setAnimation(R.raw.lottie_system_nav_3_button);