| commit | 31ebeb690e3c7d2ba5cb3b4d3b6bc1654c6acb23 | [log] [tgz] |
|---|---|---|
| author | Chun-Wei Wang <wangchun@google.com> | Thu May 30 13:57:27 2024 +0800 |
| committer | Chun-Wei Wang <wangchun@google.com> | Tue Aug 27 10:16:11 2024 +0800 |
| tree | c4875f39ebe70af745f4bdadf613e66148bb4781 | |
| parent | 55834fff027ed237305bc9d9785f0feb6de47e30 [diff] |
Support alternate button Align the behavior of frp and repair to have them support the alternate button. Bug: 339735656 Test: presubmit Change-Id: Ib785db5ef16a68df4980dee451c6b638692adc5f
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java index f2ebd1f..fb3534e 100644 --- a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java +++ b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
@@ -239,6 +239,7 @@ new ChooseLockSettingsHelper.Builder(this); launchedCDC = builder.setHeader(mTitle) .setDescription(mDetails) + .setAlternateButton(alternateButton) .setExternal(true) .setUserId(LockPatternUtils.USER_REPAIR_MODE) .show();
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java index 2af360a..9a50eef 100644 --- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java +++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
@@ -197,8 +197,8 @@ 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) {