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

Commit 0ab0255f authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge "1/n: Make ChooseLockSettingsHelper into a builder"

parents 953a2dc0 b13bc505

src/com/android/settings/MasterClear.java

+5 −2
Original line number Diff line number Diff line
@@ -139,8 +139,11 @@ public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutL 
     */

    private boolean runKeyguardConfirmation(int request) {

        Resources res = getActivity().getResources();

        return new ChooseLockSettingsHelper(getActivity(), this).launchConfirmationActivity(

                request, res.getText(R.string.master_clear_short_title));

        final ChooseLockSettingsHelper.Builder builder =

                new ChooseLockSettingsHelper.Builder(getActivity(), this);

        return builder.setRequestCode(request)

                .setTitle(res.getText(R.string.master_clear_short_title))

                .show();

    }



    @VisibleForTesting

src/com/android/settings/ResetNetwork.java

+5 −2
Original line number Diff line number Diff line
@@ -92,8 +92,11 @@ public class ResetNetwork extends InstrumentedFragment { 
     */

    private boolean runKeyguardConfirmation(int request) {

        Resources res = getActivity().getResources();

        return new ChooseLockSettingsHelper(getActivity(), this).launchConfirmationActivity(

                request, res.getText(R.string.reset_network_title));

        final ChooseLockSettingsHelper.Builder builder =

                new ChooseLockSettingsHelper.Builder(getActivity(), this);

        return builder.setRequestCode(request)

                .setTitle(res.getText(R.string.reset_network_title))

                .show();

    }



    @Override

src/com/android/settings/Utils.java

+2 −2
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ public final class Utils extends com.android.settingslib.Utils { 
     *

     * @param isInternal indicating if the caller is "internal" to the system,

     *            meaning we're willing to trust extras like

     *            {@link ChooseLockSettingsHelper#EXTRA_ALLOW_ANY_USER}.

     *            {@link ChooseLockSettingsHelper#EXTRA_KEY_ALLOW_ANY_USER}.

     * @throws SecurityException if the given userId does not belong to the

     *             current user group.

     */
@@ -643,7 +643,7 @@ public final class Utils extends com.android.settingslib.Utils { 
            return getCredentialOwnerUserId(context);

        }

        final boolean allowAnyUser = isInternal

                && bundle.getBoolean(ChooseLockSettingsHelper.EXTRA_ALLOW_ANY_USER, false);

                && bundle.getBoolean(ChooseLockSettingsHelper.EXTRA_KEY_ALLOW_ANY_USER, false);

        final int userId = bundle.getInt(Intent.EXTRA_USER_ID, UserHandle.myUserId());

        if (userId == LockPatternUtils.USER_FRP) {

            return allowAnyUser ? userId : enforceSystemUser(context, userId);

src/com/android/settings/accounts/AddAccountSettings.java

+7 −5
Original line number Diff line number Diff line
@@ -163,11 +163,13 @@ public class AddAccountSettings extends Activity { 
        } else {

            // If the user is locked by fbe: we couldn't start the authenticator. So we must ask the

            // user to unlock it first.

            ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this);

            if (!helper.launchConfirmationActivity(UNLOCK_WORK_PROFILE_REQUEST,

                    getString(R.string.unlock_set_unlock_launch_picker_title),

                    false,

                    mUserHandle.getIdentifier())) {

            final ChooseLockSettingsHelper.Builder builder =

                    new ChooseLockSettingsHelper.Builder(this);

            final boolean launched = builder.setRequestCode(UNLOCK_WORK_PROFILE_REQUEST)

                    .setTitle(getString(R.string.unlock_set_unlock_launch_picker_title))

                    .setUserId(mUserHandle.getIdentifier())

                    .show();

            if (!launched) {

                requestChooseAccount();

            }

        }

src/com/android/settings/applications/ConvertToFbe.java

+5 −3
Original line number Diff line number Diff line
@@ -39,9 +39,11 @@ public class ConvertToFbe extends InstrumentedFragment { 


    private boolean runKeyguardConfirmation(int request) {

        Resources res = getActivity().getResources();

        return new ChooseLockSettingsHelper(getActivity(), this)

                .launchConfirmationActivity(request,

                        res.getText(R.string.convert_to_file_encryption));

        final ChooseLockSettingsHelper.Builder builder =

                new ChooseLockSettingsHelper.Builder(getActivity(), this);

        return builder.setRequestCode(request)

                .setTitle(res.getText(R.string.convert_to_file_encryption))

                .show();

    }



    @Override