| commit | 6eccd73996c4678f6b9ad4e2bb78e61255b1a0f5 | [log] [tgz] |
|---|---|---|
| author | Chun-Wei Wang <wangchun@google.com> | Mon Sep 09 14:26:02 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 09 14:26:02 2024 +0000 |
| tree | fe5aabfcab59ee6668c54323989ba2ed71cde7a9 | |
| parent | d47d22ecaf9c485e9529cf989a1d6a1ee5a00e76 [diff] | |
| parent | 88bbe8fe1d0ce3a9678217952cd6b610621e496c [diff] |
Merge "Support alternate button" into main am: 88bbe8fe1d Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3244020 Change-Id: I875a923cac31bd561ff5a1cbf80000d6a1c3803e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java index 7f362c3..47c3b3f 100644 --- a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java +++ b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
@@ -267,6 +267,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 cfee980..61866a3 100644 --- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java +++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
@@ -198,8 +198,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) {