Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc2ca451 authored by cretin45's avatar cretin45
Browse files

SetupWizard: Allow skip of optional screens 

Change-Id: I018d0d86a0aa711926c32f172a4d7ece6a095454
parent 4161a57c

res/raw/cm_wizard_script_user.xml

+1 −5
Original line number Diff line number Diff line
@@ -17,11 +17,7 @@ 
-->



<WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard"

              wizard:firstAction="welcome">



    <WizardAction wizard:uri="intent:#Intent;action=com.cyanogenmod.setupwizard.LINEAGE_WELCOME;end" id="welcome">

        <result wizard:action="finish" />

    </WizardAction>

              wizard:firstAction="finish">



    <WizardAction wizard:uri="intent:#Intent;action=com.cyanogenmod.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish">

        <result wizard:action="exit" />

src/com/cyanogenmod/setupwizard/FingerprintActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ public class FingerprintActivity extends SubBaseActivity { 


    @Override

    protected void onStartSubactivity() {

        setNextText(R.string.skip);

        setNextAllowed(true);

        findViewById(R.id.setup_fingerprint).setOnClickListener(new View.OnClickListener() {

            @Override

            public void onClick(View v) {

src/com/cyanogenmod/setupwizard/ScreenLockActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ public class ScreenLockActivity extends SubBaseActivity { 


    @Override

    protected void onStartSubactivity() {

        setNextText(R.string.skip);

        setNextAllowed(true);

        findViewById(R.id.setup_lockscreen).setOnClickListener(new View.OnClickListener() {

            @Override

            public void onClick(View v) {

src/com/cyanogenmod/setupwizard/SubBaseActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -48,10 +48,10 @@ public abstract class SubBaseActivity extends BaseSetupWizardActivity { 
        }

        super.onCreate(savedInstanceState);

        setNextText(R.string.skip);

        setNextAllowed(false);

        if (savedInstanceState == null) {

            onStartSubactivity();

        }

        setNextAllowed(false);

    }



    @Override