Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dee673b0 authored by Pasty Chang's avatar Pasty Chang Committed by Android (Google) Code Review
Browse files

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

parents bab3bf6f d69b86a0

src/com/android/settings/SetupWizardUtils.java

+1 −4
Original line number Diff line number Diff line
@@ -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);

    }

}

tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java

+2 −2
Original line number Diff line number Diff line
@@ -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();

    }