From b05350b9200384d85596a348e299211d8bf3f4f9 Mon Sep 17 00:00:00 2001
From: Christian Oder <myself5@carbonrom.org>
Date: Mon, 9 Nov 2020 18:12:08 +0100
Subject: [PATCH] LSW: Fix backtrack to LineageSettings fragment

The current handling results in the followup activity to ignore it for
backtracks which means when going from Location -> LineageSettings -> Fingerprint
the move backwards from Fingerprint leads up in Location and not the expected
LineageSettings.

The custom handling is necessary to process the result in the Google SUW,
so it has been fixed to properly work now.

Change-Id: Ifae5dc8fda07b61bd0271da1d1589059ab40cd39
---
 .../setupwizard/LineageSettingsActivity.java          | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/org/lineageos/setupwizard/LineageSettingsActivity.java b/src/org/lineageos/setupwizard/LineageSettingsActivity.java
index dfe4bde2..5eba7a42 100644
--- a/src/org/lineageos/setupwizard/LineageSettingsActivity.java
+++ b/src/org/lineageos/setupwizard/LineageSettingsActivity.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017-2019 The LineageOS Project
+ * Copyright (C) 2017-2020 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -134,14 +134,9 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
     }
 
     @Override
-    public void onNavigateBack() {
-        onBackPressed();
-    }
-
-    @Override
-    public void onNavigateNext() {
+    protected void onNextPressed() {
         Intent intent = WizardManagerHelper.getNextIntent(getIntent(), Activity.RESULT_OK);
-        startActivityForResult(intent, 1);
+        nextAction(NEXT_REQUEST, intent);
     }
 
     @Override