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

SetupWizard: Adapt to new GMS tap & go expectations.

Browse Source 
Googles SetupWizard expects a specific flow for the restoration
  process -- amend the intent for gms restore to abide.

Change-Id: Idf4c3b813676c5456770627067a42697ab756bb0
TICKET: CYNGNOS-2233
This commit is contained in:
Adnan Begovic 2016-03-16 17:09:49 -07:00
parent 0d83f7c062
commit 744827989c
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,6 +53,8 @@ public class SetupWizardApp extends Application {
public static final String EXTRA_LOGIN_FOR_KILL_SWITCH = "authCks"; public static final String EXTRA_LOGIN_FOR_KILL_SWITCH = "authCks";
public static final String EXTRA_TITLE = "title"; public static final String EXTRA_TITLE = "title";
public static final String EXTRA_DETAILS = "details"; public static final String EXTRA_DETAILS = "details";
public static final String EXTRA_FRAGMENT = "fragment";
public static final String EXTRA_ACTION_ID = "actionId";
public static final String KEY_DETECT_CAPTIVE_PORTAL = "captive_portal_detection_enabled"; public static final String KEY_DETECT_CAPTIVE_PORTAL = "captive_portal_detection_enabled";

11
src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java
View File

@ -28,6 +28,7 @@ import android.app.FragmentManager;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager;
import android.database.ContentObserver; import android.database.ContentObserver;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
@ -47,7 +48,11 @@ public class GmsAccountPage extends SetupPage {
public static final String TAG = "GmsAccountPage"; public static final String TAG = "GmsAccountPage";
public static final String ACTION_RESTORE = "com.google.android.setupwizard.RESTORE"; public static final String ACTION_PROGRESS = "com.google.android.setupwizard.PROGRESS";
public static final String RESTORE_ACTION_ID = "mfm_restore_start";
public static final String FRAGMENT_START_RESTORE =
"com.google.android.setupwizard.account.StartRestoreFragment";
private static final String RESTORE_WIZARD_SCRIPT = private static final String RESTORE_WIZARD_SCRIPT =
"android.resource://com.google.android.setupwizard/xml/wizard_script"; "android.resource://com.google.android.setupwizard/xml/wizard_script";
@ -176,7 +181,9 @@ public class GmsAccountPage extends SetupPage {
try { try {
// GMS can disable this after logging in sometimes // GMS can disable this after logging in sometimes
if (SetupWizardUtils.enableGMSSetupWizard(mContext)) { if (SetupWizardUtils.enableGMSSetupWizard(mContext)) {
Intent intent = new Intent(ACTION_RESTORE); Intent intent = new Intent(ACTION_PROGRESS);
intent.putExtra(SetupWizardApp.EXTRA_FRAGMENT, FRAGMENT_START_RESTORE);
intent.putExtra(SetupWizardApp.EXTRA_ACTION_ID, RESTORE_ACTION_ID);
intent.putExtra(SetupWizardApp.EXTRA_ALLOW_SKIP, true); intent.putExtra(SetupWizardApp.EXTRA_ALLOW_SKIP, true);
intent.putExtra(SetupWizardApp.EXTRA_USE_IMMERSIVE, true); intent.putExtra(SetupWizardApp.EXTRA_USE_IMMERSIVE, true);
intent.putExtra(SetupWizardApp.EXTRA_FIRST_RUN, true); intent.putExtra(SetupWizardApp.EXTRA_FIRST_RUN, true);