diff options
| author | doc HD <doc.divxm@gmail.com> | 2021-04-02 19:51:48 +0300 |
|---|---|---|
| committer | Ali B <abittin@gmail.com> | 2021-04-11 20:01:36 +0300 |
| commit | 1a8861a8dd13cd0910a7e19acf19c627e72c7174 (patch) | |
| tree | e0129b7d64da43081760456b6a0431c9d2746cd3 | |
| parent | 16ffff15579ea772417a563f88b199f7032be2ca (diff) | |
Revert "SetupWizard: Add seedvault restore page in GMS flow"
This reverts commit 7423d88cd0011a494bca3d709d3766c67e25db40.
Change-Id: I60a25db36baa07b5e7790b1f24917f62dac60f94
| -rw-r--r-- | AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | res/raw/wizard_script.xml | 3 | ||||
| -rw-r--r-- | src/org/lineageos/setupwizard/backup/RestoreIntroActivity.java | 10 |
3 files changed, 1 insertions, 13 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 332189c..602c40f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -277,6 +277,7 @@ 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 bc2339a..af7ad94 100644 --- a/res/raw/wizard_script.xml +++ b/res/raw/wizard_script.xml @@ -102,9 +102,6 @@ <result wizard:action="recovery_update" /> </WizardAction> <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RECOVERY_UPDATE;end" id="recovery_update"> - <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 b0ee807..3ced83d 100644 --- a/src/org/lineageos/setupwizard/backup/RestoreIntroActivity.java +++ b/src/org/lineageos/setupwizard/backup/RestoreIntroActivity.java @@ -17,11 +17,7 @@ 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; @@ -38,12 +34,6 @@ public class RestoreIntroActivity extends SubBaseActivity { } @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; } |