Support alternate button
Align the behavior of frp and repair to have them support the alternate button. Bug: 339735656 Test: presubmit Change-Id: Ib785db5ef16a68df4980dee451c6b638692adc5f
This commit is contained in:
@@ -239,6 +239,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();
|
||||
|
@@ -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) {
|
||||
|
Reference in New Issue
Block a user