From d69b86a0ef9659f4ca0126c111698505f0626346 Mon Sep 17 00:00:00 2001 From: pastychang Date: Tue, 26 Mar 2019 19:48:13 +0800 Subject: [PATCH] Copy extra of suw flow to the intent of lock screen pages Bug: 129323340 Test: atest Change-Id: I3886c097bd49df9e1169f8004889f9af8c567560 --- src/com/android/settings/SetupWizardUtils.java | 5 +---- .../src/com/android/settings/SetupWizardUtilsTest.java | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/com/android/settings/SetupWizardUtils.java b/src/com/android/settings/SetupWizardUtils.java index 70ee2ca0bf5..166e0655f1d 100644 --- a/src/com/android/settings/SetupWizardUtils.java +++ b/src/com/android/settings/SetupWizardUtils.java @@ -67,9 +67,6 @@ public class SetupWizardUtils { } public static void copySetupExtras(Intent fromIntent, Intent toIntent) { - toIntent.putExtra(WizardManagerHelper.EXTRA_THEME, - fromIntent.getStringExtra(WizardManagerHelper.EXTRA_THEME)); - toIntent.putExtra(WizardManagerHelper.EXTRA_USE_IMMERSIVE_MODE, - fromIntent.getBooleanExtra(WizardManagerHelper.EXTRA_USE_IMMERSIVE_MODE, false)); + WizardManagerHelper.copyWizardManagerExtras(fromIntent, toIntent); } } diff --git a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java index f718a67412c..4fe8fa8a466 100644 --- a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java +++ b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java @@ -36,12 +36,12 @@ public class SetupWizardUtilsTest { Intent fromIntent = new Intent(); final String theme = "TEST_THEME"; fromIntent.putExtra(WizardManagerHelper.EXTRA_THEME, theme); - fromIntent.putExtra(WizardManagerHelper.EXTRA_USE_IMMERSIVE_MODE, true); + fromIntent.putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true); Intent toIntent = new Intent(); SetupWizardUtils.copySetupExtras(fromIntent, toIntent); assertThat(theme).isEqualTo(toIntent.getStringExtra(WizardManagerHelper.EXTRA_THEME)); - assertThat(toIntent.getBooleanExtra(WizardManagerHelper.EXTRA_USE_IMMERSIVE_MODE, false)) + assertThat(toIntent.getBooleanExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, false)) .isTrue(); }