SetupWizard: Allow skip of optional screens

Change-Id: I018d0d86a0aa711926c32f172a4d7ece6a095454

src/com/cyanogenmod/setupwizard/FingerprintActivity.java

@@ -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

@@ -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

@@ -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