PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Copy extra of suw flow to the intent of lock screen pages"

Browse Source
This commit is contained in:
Pasty Chang
2019-03-28 03:03:09 +00:00
committed by Android (Google) Code Review
parent bab3bf6f22 d69b86a0ef
commit dee673b0d7
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/SetupWizardUtils.java
View File

@@ -67,9 +67,6 @@ public class SetupWizardUtils {
} }
public static void copySetupExtras(Intent fromIntent, Intent toIntent) { public static void copySetupExtras(Intent fromIntent, Intent toIntent) {
toIntent.putExtra(WizardManagerHelper.EXTRA_THEME, WizardManagerHelper.copyWizardManagerExtras(fromIntent, toIntent);
fromIntent.getStringExtra(WizardManagerHelper.EXTRA_THEME));
toIntent.putExtra(WizardManagerHelper.EXTRA_USE_IMMERSIVE_MODE,
fromIntent.getBooleanExtra(WizardManagerHelper.EXTRA_USE_IMMERSIVE_MODE, false));
} }
} }

4
tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
View File

@@ -36,12 +36,12 @@ public class SetupWizardUtilsTest {
Intent fromIntent = new Intent(); Intent fromIntent = new Intent();
final String theme = "TEST_THEME"; final String theme = "TEST_THEME";
fromIntent.putExtra(WizardManagerHelper.EXTRA_THEME, 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(); Intent toIntent = new Intent();
SetupWizardUtils.copySetupExtras(fromIntent, toIntent); SetupWizardUtils.copySetupExtras(fromIntent, toIntent);
assertThat(theme).isEqualTo(toIntent.getStringExtra(WizardManagerHelper.EXTRA_THEME)); 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(); .isTrue();
} }