PawletOS/lineageos_setupwizard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SetupWizard: Allow skip of optional screens

Browse Source 
Change-Id: I018d0d86a0aa711926c32f172a4d7ece6a095454
This commit is contained in:
cretin45
2017-02-16 23:01:33 -08:00
parent 4161a57ccc
commit fc2ca45177
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/raw/cm_wizard_script_user.xml
View File

@@ -17,11 +17,7 @@
--> -->
<WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard" <WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard"
wizard:firstAction="welcome"> wizard:firstAction="finish">
<WizardAction wizard:uri="intent:#Intent;action=com.cyanogenmod.setupwizard.LINEAGE_WELCOME;end" id="welcome">
<result wizard:action="finish" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=com.cyanogenmod.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish"> <WizardAction wizard:uri="intent:#Intent;action=com.cyanogenmod.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish">
<result wizard:action="exit" /> <result wizard:action="exit" />

2
src/com/cyanogenmod/setupwizard/FingerprintActivity.java
View File

@@ -37,7 +37,7 @@ public class FingerprintActivity extends SubBaseActivity {
@Override @Override
protected void onStartSubactivity() { protected void onStartSubactivity() {
setNextText(R.string.skip); setNextAllowed(true);
findViewById(R.id.setup_fingerprint).setOnClickListener(new View.OnClickListener() { findViewById(R.id.setup_fingerprint).setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {

2
src/com/cyanogenmod/setupwizard/ScreenLockActivity.java
View File

@@ -31,7 +31,7 @@ public class ScreenLockActivity extends SubBaseActivity {
@Override @Override
protected void onStartSubactivity() { protected void onStartSubactivity() {
setNextText(R.string.skip); setNextAllowed(true);
findViewById(R.id.setup_lockscreen).setOnClickListener(new View.OnClickListener() { findViewById(R.id.setup_lockscreen).setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {

2
src/com/cyanogenmod/setupwizard/SubBaseActivity.java
View File

@@ -48,10 +48,10 @@ public abstract class SubBaseActivity extends BaseSetupWizardActivity {
} }
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setNextText(R.string.skip); setNextText(R.string.skip);
setNextAllowed(false);
if (savedInstanceState == null) { if (savedInstanceState == null) {
onStartSubactivity(); onStartSubactivity();
} }
setNextAllowed(false);
} }
@Override @Override