ADHOC/replicant-packages_apps_SetupWizard
3
0
Fork 0
Code Issues Pull Requests Releases Activity

SetupWizard: Alway show google pages if gms present

Browse Source 
Helps with an issue where qsb widget doesn't work when
running through oobe without network.

Also set the cm setup finished setting for test receiver.

CYNGNOS-2833

Change-Id: I83666deea5a27d74669691c4ab991b1b618edb0a
This commit is contained in:
cretin45 2016-05-13 15:34:56 -07:00 committed by Ed Carrigan
parent 44026d9007
commit 36f15ef169
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java
View File

@ -64,8 +64,9 @@ public class CMSetupWizardData extends AbstractSetupData {
pages.add(new MobileDataPage(mContext, this) pages.add(new MobileDataPage(mContext, this)
.setHidden(!isSimInserted() || mMobileDataEnabled)); .setHidden(!isSimInserted() || mMobileDataEnabled));
} }
if (SetupWizardUtils.hasGMS(mContext)) { final boolean hasGMS = SetupWizardUtils.hasGMS(mContext);
pages.add(new GmsAccountPage(mContext, this).setHidden(true)); if (hasGMS) {
pages.add(new GmsAccountPage(mContext, this));
} }
if (!SetupWizardUtils.hasLeanback(mContext) && if (!SetupWizardUtils.hasLeanback(mContext) &&
SetupWizardUtils.isPackageInstalled(mContext, SetupWizardUtils.isPackageInstalled(mContext,
@ -76,7 +77,7 @@ public class CMSetupWizardData extends AbstractSetupData {
pages.add(new FingerprintSetupPage(mContext, this)); pages.add(new FingerprintSetupPage(mContext, this));
} }
pages.add(new CyanogenSettingsPage(mContext, this)); pages.add(new CyanogenSettingsPage(mContext, this));
pages.add(new OtherSettingsPage(mContext, this)); pages.add(new OtherSettingsPage(mContext, this).setHidden(!hasGMS));
pages.add(new DateTimePage(mContext, this)); pages.add(new DateTimePage(mContext, this));
pages.add(new FinishPage(mContext, this)); pages.add(new FinishPage(mContext, this));
return new PageList(pages.toArray(new SetupPage[pages.size()])); return new PageList(pages.toArray(new SetupPage[pages.size()]));
@ -111,16 +112,6 @@ public class CMSetupWizardData extends AbstractSetupData {
private void showHideAccountPages() { private void showHideAccountPages() {
boolean isConnected = SetupWizardUtils.isNetworkConnected(mContext); boolean isConnected = SetupWizardUtils.isNetworkConnected(mContext);
GmsAccountPage gmsAccountPage =
(GmsAccountPage) getPage(GmsAccountPage.TAG);
OtherSettingsPage otherSettingsPage = (OtherSettingsPage) getPage(OtherSettingsPage.TAG);
if (gmsAccountPage != null) {
boolean hidden = !isConnected && gmsAccountPage.canSkip();
gmsAccountPage.setHidden(hidden);
if (otherSettingsPage != null) {
otherSettingsPage.setHidden(!hidden);
}
}
CyanogenServicesPage cyanogenServicesPage = CyanogenServicesPage cyanogenServicesPage =
(CyanogenServicesPage) getPage(CyanogenServicesPage.TAG); (CyanogenServicesPage) getPage(CyanogenServicesPage.TAG);
if (cyanogenServicesPage != null) { if (cyanogenServicesPage != null) {

2
src/com/cyanogenmod/setupwizard/setup/FinishSetupReceiver.java
View File

@ -23,6 +23,8 @@ public class FinishSetupReceiver extends BroadcastReceiver {
StatusBarManager.DISABLE_NONE); StatusBarManager.DISABLE_NONE);
Settings.Global.putInt(context.getContentResolver(), Settings.Global.putInt(context.getContentResolver(),
SetupWizardApp.KEY_DETECT_CAPTIVE_PORTAL, 1); SetupWizardApp.KEY_DETECT_CAPTIVE_PORTAL, 1);
cyanogenmod.providers.CMSettings.Secure.putInt(context.getContentResolver(),
cyanogenmod.providers.CMSettings.Secure.CM_SETUP_WIZARD_COMPLETED, 1);
SetupWizardUtils.disableGMSSetupWizard(context); SetupWizardUtils.disableGMSSetupWizard(context);
SetupWizardUtils.disableSetupWizard(context); SetupWizardUtils.disableSetupWizard(context);
} }