SetupWizard: Add option to apply default theme if one exists
* A bunch of code cleanup/refactoring to make this work Change-Id: I059fb5fa5bcd7dd8821e993218a320554f10a314
This commit is contained in:
@@ -16,10 +16,6 @@
|
||||
|
||||
package com.cyanogenmod.setupwizard.setup;
|
||||
|
||||
import com.cyanogenmod.setupwizard.R;
|
||||
import com.cyanogenmod.setupwizard.ui.SetupWizardActivity;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.Fragment;
|
||||
import android.app.FragmentManager;
|
||||
import android.content.Context;
|
||||
@@ -29,6 +25,8 @@ import android.transition.Slide;
|
||||
import android.transition.Transition;
|
||||
import android.view.Gravity;
|
||||
|
||||
import com.cyanogenmod.setupwizard.R;
|
||||
|
||||
|
||||
public abstract class SetupPage implements Page {
|
||||
|
||||
@@ -38,9 +36,9 @@ public abstract class SetupPage implements Page {
|
||||
private boolean mRequired = false;
|
||||
private boolean mHidden = false;
|
||||
|
||||
protected final SetupWizardActivity mContext;
|
||||
protected final Context mContext;
|
||||
|
||||
protected SetupPage(SetupWizardActivity context, SetupDataCallbacks callbacks) {
|
||||
protected SetupPage(Context context, SetupDataCallbacks callbacks) {
|
||||
mContext = context;
|
||||
mCallbacks = callbacks;
|
||||
}
|
||||
@@ -74,9 +72,7 @@ public abstract class SetupPage implements Page {
|
||||
public void onFinishSetup() {}
|
||||
|
||||
@Override
|
||||
public void doLoadAction(SetupWizardActivity context, int action) {
|
||||
if (context == null || context.isFinishing()) { return; }
|
||||
final FragmentManager fragmentManager = context.getFragmentManager();
|
||||
public void doLoadAction(FragmentManager fragmentManager, int action) {
|
||||
Fragment fragment = getFragment(fragmentManager, action);
|
||||
if (action == Page.ACTION_NEXT) {
|
||||
Transition t = new Slide(Gravity.RIGHT);
|
||||
@@ -93,6 +89,9 @@ public abstract class SetupPage implements Page {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFragmentReady(){}
|
||||
|
||||
@Override
|
||||
public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
|
||||
return false;
|
||||
|
Reference in New Issue
Block a user