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

Commit 32cf2e3a authored by Chun-Wei Wang's avatar Chun-Wei Wang Committed by Automerger Merge Worker
Browse files

Merge "Support alternate button" into main am: 88bbe8fe am: 6eccd739 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3244020



Change-Id: Ia2853f58135f975bf0f6dd687efee52e622eac8a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1a90869f 6eccd739

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

+1 −0
Original line number Diff line number Diff line
@@ -293,6 +293,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity { 
                    new ChooseLockSettingsHelper.Builder(this);

            launchedCDC = builder.setHeader(mTitle)

                    .setDescription(mDetails)

                    .setAlternateButton(alternateButton)

                    .setExternal(true)

                    .setUserId(LockPatternUtils.USER_REPAIR_MODE)

                    .show();

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

+2 −2
Original line number Diff line number Diff line
@@ -197,8 +197,8 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr 
        mCancelButton = view.findViewById(R.id.cancelButton);

        boolean showCancelButton = mRemoteValidation || getActivity().getIntent().getBooleanExtra(

                SHOW_CANCEL_BUTTON, false);

        boolean hasAlternateButton = (mFrp || mRemoteValidation) && !TextUtils.isEmpty(

                mAlternateButtonText);

        boolean hasAlternateButton = (mFrp || mRemoteValidation || mRepairMode)

                && !TextUtils.isEmpty(mAlternateButtonText);

        mCancelButton.setVisibility(showCancelButton || hasAlternateButton

                ? View.VISIBLE : View.GONE);

        if (hasAlternateButton) {