PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Support alternate button" into main am: 88bbe8fe1d am: 6eccd73996

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

Change-Id: Ia2853f58135f975bf0f6dd687efee52e622eac8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chun-Wei Wang
2024-09-09 14:34:57 +00:00
committed by Automerger Merge Worker
parent 1a90869f28 6eccd73996
commit 32cf2e3a11
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
View File

@@ -293,6 +293,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
new ChooseLockSettingsHelper.Builder(this); new ChooseLockSettingsHelper.Builder(this);
launchedCDC = builder.setHeader(mTitle) launchedCDC = builder.setHeader(mTitle)
.setDescription(mDetails) .setDescription(mDetails)
.setAlternateButton(alternateButton)
.setExternal(true) .setExternal(true)
.setUserId(LockPatternUtils.USER_REPAIR_MODE) .setUserId(LockPatternUtils.USER_REPAIR_MODE)
.show(); .show();

4
src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
View File

@@ -197,8 +197,8 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr
mCancelButton = view.findViewById(R.id.cancelButton); mCancelButton = view.findViewById(R.id.cancelButton);
boolean showCancelButton = mRemoteValidation || getActivity().getIntent().getBooleanExtra( boolean showCancelButton = mRemoteValidation || getActivity().getIntent().getBooleanExtra(
SHOW_CANCEL_BUTTON, false); SHOW_CANCEL_BUTTON, false);
boolean hasAlternateButton = (mFrp || mRemoteValidation) && !TextUtils.isEmpty( boolean hasAlternateButton = (mFrp || mRemoteValidation || mRepairMode)
mAlternateButtonText); && !TextUtils.isEmpty(mAlternateButtonText);
mCancelButton.setVisibility(showCancelButton || hasAlternateButton mCancelButton.setVisibility(showCancelButton || hasAlternateButton
? View.VISIBLE : View.GONE); ? View.VISIBLE : View.GONE);
if (hasAlternateButton) { if (hasAlternateButton) {