From 7423d88cd0011a494bca3d709d3766c67e25db40 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Wed, 18 Nov 2020 15:43:33 +0200
Subject: [PATCH] SetupWizard: Add seedvault restore page in GMS flow

Change-Id: I1ce86864b4a8d0477cd2db77a3820583e24c758a
---
 AndroidManifest.xml                                    |  1 -
 res/raw/wizard_script.xml                              |  3 +++
 .../setupwizard/backup/RestoreIntroActivity.java       | 10 ++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d3e73d3c..491ea8d6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -266,7 +266,6 @@
                   android:excludeFromRecents="true"
                   android:configChanges="mcc|mnc"
                   android:immersive="true"
-                  android:exported="false"
                   android:windowSoftInputMode="stateAlwaysHidden">
             <intent-filter>
                 <action android:name="org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP"/>
diff --git a/res/raw/wizard_script.xml b/res/raw/wizard_script.xml
index dfb85d7d..f82ab401 100644
--- a/res/raw/wizard_script.xml
+++ b/res/raw/wizard_script.xml
@@ -99,6 +99,9 @@
     </WizardAction>
     <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_qr_provision_flow" id="qr_provision_flow" />
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETTINGS;end" id="oem_post_setup">
+        <result wizard:action="restore" />
+    </WizardAction>
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP;end" id="restore">
         <result wizard:action="finish" />
     </WizardAction>
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish">
diff --git a/src/org/lineageos/setupwizard/backup/RestoreIntroActivity.java b/src/org/lineageos/setupwizard/backup/RestoreIntroActivity.java
index 3ced83de..b0ee807c 100644
--- a/src/org/lineageos/setupwizard/backup/RestoreIntroActivity.java
+++ b/src/org/lineageos/setupwizard/backup/RestoreIntroActivity.java
@@ -17,7 +17,11 @@
 
 package org.lineageos.setupwizard.backup;
 
+import android.app.Activity;
 import android.content.Intent;
+
+import com.google.android.setupcompat.util.WizardManagerHelper;
+
 import org.lineageos.setupwizard.R;
 import org.lineageos.setupwizard.SubBaseActivity;
 
@@ -33,6 +37,12 @@ public class RestoreIntroActivity extends SubBaseActivity {
         findViewById(R.id.intro_restore_button).setOnClickListener(v -> launchRestore());
     }
 
+    @Override
+    protected void onNextPressed() {
+        Intent intent = WizardManagerHelper.getNextIntent(getIntent(), Activity.RESULT_OK);
+        nextAction(NEXT_REQUEST, intent);
+    }
+
     @Override
     protected int getLayoutResId() {
         return R.layout.intro_restore_activity;