diff options
| author | Bill Rassieur <rassb@google.com> | 2019-04-02 18:33:52 +0000 |
|---|---|---|
| committer | Bill Rassieur <rassb@google.com> | 2019-04-02 18:33:52 +0000 |
| commit | db8640b3a5691ca6ec863c9cc1ef4c175c47d34f (patch) | |
| tree | d4d0f1ccfa3d6b82ef0a0be0a353328a3001714d | |
| parent | 67c702155426e3a7848f20b59ba03f871bc3e3cb (diff) | |
| parent | f2abf71d833633b5c78249164b471e07d12dcfb7 (diff) | |
| download | setupwizard-db8640b3a5691ca6ec863c9cc1ef4c175c47d34f.tar.gz | |
Merge master@5428150 into git_qt-dev-plus-aosp.
Change-Id: Iea225ccac1abcab67b9c83825e0557aa3e090f42
BUG: 129345239
| -rw-r--r-- | library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java b/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java index 2342fa5..4d75c78 100644 --- a/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java +++ b/library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java @@ -47,6 +47,7 @@ public class WizardManagerHelper { @VisibleForTesting static final String EXTRA_IS_FIRST_RUN = "firstRun"; @VisibleForTesting static final String EXTRA_IS_DEFERRED_SETUP = "deferredSetup"; @VisibleForTesting static final String EXTRA_IS_PRE_DEFERRED_SETUP = "preDeferredSetup"; + @VisibleForTesting public static final String EXTRA_IS_SETUP_FLOW = "isSetupFlow"; public static final String EXTRA_THEME = "theme"; public static final String EXTRA_USE_IMMERSIVE_MODE = "useImmersiveMode"; @@ -143,7 +144,11 @@ public class WizardManagerHelper { public static void copyWizardManagerExtras(Intent srcIntent, Intent dstIntent) { dstIntent.putExtra(EXTRA_WIZARD_BUNDLE, srcIntent.getBundleExtra(EXTRA_WIZARD_BUNDLE)); for (String key : - Arrays.asList(EXTRA_IS_FIRST_RUN, EXTRA_IS_DEFERRED_SETUP, EXTRA_IS_PRE_DEFERRED_SETUP)) { + Arrays.asList( + EXTRA_IS_FIRST_RUN, + EXTRA_IS_DEFERRED_SETUP, + EXTRA_IS_PRE_DEFERRED_SETUP, + EXTRA_IS_SETUP_FLOW)) { dstIntent.putExtra(key, srcIntent.getBooleanExtra(key, false)); } |