commit 44fb45c42187cd66a1e305b8317385c95f1a73a2
author Timi Rautamäki <timi.rautamaki@gmail.com> Sun Aug 22 18:27:26 2021 +0000
committer Timi Rautamäki <timi.rautamaki@gmail.com> Fri Sep 03 11:58:28 2021 +0000
tree e159c6b8ea8fa682be7855939c098ceb33660478
parent ab4d6d383fd3bdb7bc9e292a2727de3bde86eacc

SUW: use standard navigation method

Use software/hardware back button and add on-screen Next & Skip buttons.

Change-Id: I7bfa052f2217e51ea778df688e7169657aaad2c6

src/org/lineageos/setupwizard/WelcomeActivity.java

diff --git a/src/org/lineageos/setupwizard/WelcomeActivity.java b/src/org/lineageos/setupwizard/WelcomeActivity.java
index 7f6aac2..3fef20d 100644
--- a/src/org/lineageos/setupwizard/WelcomeActivity.java
+++ b/src/org/lineageos/setupwizard/WelcomeActivity.java
@@ -35,8 +35,7 @@
         super.onCreate(savedInstanceState);
         mRootView = findViewById(R.id.setup_wizard_layout);
         setNextText(R.string.next);
-        setBackText(R.string.emergency_call);
-        setBackDrawable(null);
+        setSkipText(R.string.emergency_call);
         mEnableAccessibilityController =
                 EnableAccessibilityController.getInstance(getApplicationContext());
         mRootView.setOnTouchListener((v, event) ->
@@ -48,6 +47,11 @@
     public void onBackPressed() {}
 
     @Override
+    public void onSkip() {
+        startEmergencyDialer();
+    }
+
+    @Override
     public void onNavigateBack() {
         startEmergencyDialer();
     }