PeterCxy
/
SetupWizardLibrary
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge master@5428150 into git_qt-dev-plus-aosp. 

Change-Id: Iea225ccac1abcab67b9c83825e0557aa3e090f42
BUG: 129345239
This commit is contained in:
Bill Rassieur 2019-04-02 18:33:52 +00:00
parent 67c7021554 f2abf71d83
commit db8640b3a5
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/main/src/com/android/setupwizardlib/util/WizardManagerHelper.java
View File

@ -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));
}