SetupWizard: Add receivers for sim state and time (106a1275) · Commits · e / os / android_packages_apps_SetupWizard

src/com/cyanogenmod/setupwizard/setup/AbstractSetupData.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -16,12 +16,13 @@

		package com.cyanogenmod.setupwizard.setup;

		import android.content.BroadcastReceiver;
		import android.content.Context;
		import android.os.Bundle;

		import java.util.ArrayList;

		public abstract class AbstractSetupData implements SetupDataCallbacks {
		public abstract class AbstractSetupData extends BroadcastReceiver implements SetupDataCallbacks {

		private static final String TAG = AbstractSetupData.class.getSimpleName();

src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java

+83 −8

Original line number	Diff line number	Diff line
		@@ -16,29 +16,47 @@

		package com.cyanogenmod.setupwizard.setup;

		import com.cyanogenmod.setupwizard.util.SetupWizardUtils;

		import android.content.Context;
		import android.telephony.SubscriptionManager;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.telephony.TelephonyManager;

		import com.android.internal.telephony.TelephonyIntents;
		import com.cyanogenmod.setupwizard.util.SetupWizardUtils;

		import java.util.ArrayList;

		public class CMSetupWizardData extends AbstractSetupData {

		private static final String TAG = CMSetupWizardData.class.getSimpleName();

		private final TelephonyManager mTelephonyManager;

		private boolean mTimeSet = false;
		private boolean mTimeZoneSet = false;

		private final int mSimSlotCount;
		private final int[] mSimStates;

		public CMSetupWizardData(Context context) {
		super(context);
		mTelephonyManager = TelephonyManager.from(context);
		mSimSlotCount = mTelephonyManager.getPhoneCount();
		mSimStates = new int[mSimSlotCount];
		for (int i = 0; i < mSimSlotCount; i++) {
		mSimStates[i] = TelephonyManager.SIM_STATE_ABSENT;
		}
		}

		@Override
		protected PageList onNewPageList() {
		ArrayList<SetupPage> pages = new ArrayList<SetupPage>();
		ArrayList<Page> pages = new ArrayList<Page>();
		pages.add(new WelcomePage(mContext, this));
		pages.add(new WifiSetupPage(mContext, this));
		if (SetupWizardUtils.isSimMissing(mContext)) {
		pages.add(new SimCardMissingPage(mContext, this));
		if (TelephonyManager.from(mContext).getSimCount() > 0) {
		pages.add(new SimCardMissingPage(mContext, this).setHidden(true));
		}
		if (SetupWizardUtils.isMultiSimDevice(mContext)
		&& SubscriptionManager.getActiveSubInfoCount() > 1) {
		if (SetupWizardUtils.isMultiSimDevice(mContext)) {
		pages.add(new ChooseDataSimPage(mContext, this));
		}
		if (SetupWizardUtils.hasTelephony(mContext) &&
		@@ -57,4 +75,61 @@ public class CMSetupWizardData extends AbstractSetupData {
		}


		@Override
		public void onReceive(Context context, Intent intent) {
		if (intent.getAction().equals(TelephonyIntents.ACTION_SIM_STATE_CHANGED)) {
		int slot = intent.getIntExtra("slot", -1);
		if (slot != -1 && mSimStates.length > 0) {
		mSimStates[slot] = mTelephonyManager.getSimState(slot);
		}
		} else if (intent.getAction().equals(Intent.ACTION_TIMEZONE_CHANGED)) {
		mTimeZoneSet = true;
		} else if (intent.getAction().equals(Intent.ACTION_TIME_CHANGED)) {
		mTimeSet = true;
		}
		DateTimePage dateTimePage = (DateTimePage) getPage(DateTimePage.TAG);
		dateTimePage.setHidden(mTimeZoneSet & mTimeSet);

		SimCardMissingPage simCardMissingPage =
		(SimCardMissingPage) getPage(SimCardMissingPage.TAG);
		if (simCardMissingPage != null) {
		simCardMissingPage.setHidden(isSimInserted());
		}

		ChooseDataSimPage chooseDataSimPage =
		(ChooseDataSimPage) getPage(ChooseDataSimPage.TAG);
		if (chooseDataSimPage != null) {
		chooseDataSimPage.setHidden(!allSimsInserted());
		}
		}

		public IntentFilter getIntentFilter() {
		IntentFilter filter = new IntentFilter();
		filter.addAction(TelephonyIntents.ACTION_SIM_STATE_CHANGED);
		filter.addAction(Intent.ACTION_TIMEZONE_CHANGED);
		filter.addAction(Intent.ACTION_TIME_CHANGED);
		return filter;
		}

		// We only care that one sim is inserted
		private boolean isSimInserted() {
		for (int state : mSimStates) {
		if (state != TelephonyManager.SIM_STATE_ABSENT
		&& state != TelephonyManager.SIM_STATE_UNKNOWN) {
		return true;
		}
		}
		return false;
		}

		// We only care the each slot has a sim
		private boolean allSimsInserted() {
		for (int state : mSimStates) {
		if (state == TelephonyManager.SIM_STATE_ABSENT) {
		return false;
		}
		}
		return true;
		}

		}
		No newline at end of file

src/com/cyanogenmod/setupwizard/setup/CyanogenServicesPage.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -107,6 +107,7 @@ public class CyanogenServicesPage extends SetupPage {
		Bundle bundle = new Bundle();
		bundle.putBoolean(SetupWizardApp.EXTRA_FIRST_RUN, true);
		bundle.putBoolean(SetupWizardApp.EXTRA_SHOW_BUTTON_BAR, true);
		bundle.putBoolean(SetupWizardApp.EXTRA_USE_IMMERSIVE, true);
		AccountManager.get(activity)
		.addAccount(activity.getString(R.string.cm_account_type), null, null, bundle,
		null, new AccountManagerCallback<Bundle>() {

src/com/cyanogenmod/setupwizard/setup/FinishPage.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -68,11 +68,6 @@ public class FinishPage extends SetupPage {
		return R.string.start;
		}

		@Override
		public int getPrevButtonTitleResId() {
		return -1;
		}

		public static class FinishFragment extends SetupPageFragment {

		@Override

src/com/cyanogenmod/setupwizard/setup/Page.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ public interface Page {
		public boolean isRequired();
		public Page setRequired(boolean required);
		public boolean isHidden();
		public void setHidden(boolean hidden);
		public Page setHidden(boolean hidden);
		public boolean doPreviousAction();
		public boolean doNextAction();
		public void doLoadAction(Activity context, int action);