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

Commit b1758afd authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "FRP: Use SUW theme for factory reset protection flow" into oc-mr1-dev am: d57edb70 

am: 2faa5e7a

Change-Id: I011b521869406bd5db74686bd7c15496a03f54c4
parents 09ed020f 2faa5e7a

src/com/android/settings/password/ChooseLockSettingsHelper.java

+2 −1
Original line number Diff line number Diff line
@@ -250,12 +250,13 @@ public final class ChooseLockSettingsHelper { 
            CharSequence message, Class<?> activityClass, boolean returnCredentials,

            boolean external, boolean hasChallenge, long challenge,

            int userId, @Nullable CharSequence alternateButton) {

        final boolean frp = (userId == LockPatternUtils.USER_FRP);

        final Intent intent = new Intent();

        intent.putExtra(ConfirmDeviceCredentialBaseFragment.TITLE_TEXT, title);

        intent.putExtra(ConfirmDeviceCredentialBaseFragment.HEADER_TEXT, header);

        intent.putExtra(ConfirmDeviceCredentialBaseFragment.DETAILS_TEXT, message);

        intent.putExtra(ConfirmDeviceCredentialBaseFragment.ALLOW_FP_AUTHENTICATION, external);

        intent.putExtra(ConfirmDeviceCredentialBaseFragment.DARK_THEME, external);

        intent.putExtra(ConfirmDeviceCredentialBaseFragment.DARK_THEME, external && !frp);

        intent.putExtra(ConfirmDeviceCredentialBaseFragment.SHOW_CANCEL_BUTTON, external);

        intent.putExtra(ConfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED, external);

        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_RETURN_CREDENTIALS, returnCredentials);