Eric Biggers 9ab4bf20f7 Merge changes I20f2330d,Iaca5b20c into main am: 790e28c431 am: 231766c463 ...

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

Change-Id: I66a91364d8211acf73310d55997bd5f6d08e2ae8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2024-05-06 18:09:47 +00:00

..

screenlock

Protect "Lock after timeout" page with an auth challenge.

2023-12-21 14:45:12 +00:00

trustagent

Use disabled summary when trustagents are disabled

2024-03-28 10:40:40 -07:00

ChangeProfileScreenLockPreferenceController.java

…

ChangeScreenLockPreferenceController.java

Clean up FeatureFactory.getFeature()

2023-08-08 08:41:48 +00:00

ContentProtectionPreferenceController.java

Refactor to use the utils class.

2023-11-16 19:46:27 +00:00

ContentProtectionPreferenceFragment.java

Hide the setting from the search when feature is disabled.

2023-11-14 20:27:52 +00:00

ContentProtectionPreferenceUtils.java

Integrate admin controls for content protection

2024-03-07 22:56:09 +00:00

ContentProtectionTogglePreferenceController.java

Integrate admin controls for content protection

2024-03-07 22:56:09 +00:00

ContentProtectionWorkSwitchController.java

Integrate admin controls for content protection

2024-03-07 22:56:09 +00:00

CredentialManagementAppAdapter.java

…

CredentialManagementAppButtonsController.java

…

CredentialManagementAppFragment.java

…

CredentialManagementAppHeaderController.java

Enable use_resource_processor for all sysui deps

2023-09-21 23:09:39 +00:00

CredentialManagementAppPolicyController.java

…

CredentialManagementAppPolicyPreference.java

…

CredentialManagementAppPreferenceController.java

…

CredentialStorage.java

Merge changes I20f2330d,Iaca5b20c into main am: 790e28c431 am: 231766c463

2024-05-06 18:09:47 +00:00

EncryptionAndCredential.java

…

EncryptionStatusPreferenceController.java

…

InstallCaCertificatePreferenceController.java

…

InstallCaCertificateWarning.java

[Safer intents] Credentials

2024-03-27 07:58:31 +00:00

InstallCertificateFromStorage.java

…

InstallCertificatePreferenceController.java

…

InstallUserCertificatePreferenceController.java

…

InstallWifiCertificatePreferenceController.java

…

LockscreenDashboardFragment.java

…

LockUnificationPreferenceController.java

Clean up FeatureFactory.getFeature()

2023-08-08 08:41:48 +00:00

MemtagFooterPreferenceController.java

…

MemtagHelper.java

Fix typo in MemtagHelper

2023-05-01 10:25:04 +00:00

MemtagPage.java

…

MemtagPagePreferenceController.java

…

MemtagPreferenceController.java

Add persistent MTE toggle to development options.

2023-02-09 13:26:27 -08:00

MemtagRebootDialog.java

Add persistent MTE toggle to development options.

2023-02-09 13:26:27 -08:00

OwnerInfoPreferenceController.java

…

OWNERS

…

RequestManageCredentials.java

Revert^2 "Nullability Annotations replacement"

2024-01-10 07:34:01 +00:00

ResetCredentialsPreferenceController.java

…

RestrictedEncryptionPreferenceController.java

…

ScreenLockPreferenceDetailsUtils.java

Clean up FeatureFactory.getFeature()

2023-08-08 08:41:48 +00:00

ScreenPinningPreferenceController.java

Revert "Remove duplicate strings."

2023-03-15 22:39:24 +00:00

ScreenPinningSettings.java

Update footer text whenever the ScreenPinningSettings is shown

2024-04-17 05:34:59 +00:00

SecurityAdvancedSettings.java

Clean up FeatureFactory.getFeature()

2023-08-08 08:41:48 +00:00

SecurityAdvancedSettingsController.java

…

SecurityFeatureProvider.java

…

SecurityFeatureProviderImpl.java

…

SecuritySettings.java

Clean up FeatureFactory.getFeature()

2023-08-08 08:41:48 +00:00

SecuritySettingsFeatureProvider.java

…

SecuritySettingsFeatureProviderImpl.java

…

ShowPasswordPreferenceController.java

Stop calling LockPatternUtils.setVisiblePasswordEnabled()

2023-02-18 00:24:40 +00:00

SimLockPreferenceController.java

Wrap subManager creation with createForAllProfiles

2024-01-22 22:02:00 +00:00

TopLevelSecurityEntryPreferenceController.java

Clean up FeatureFactory.getFeature()

2023-08-08 08:41:48 +00:00

UnificationConfirmationDialog.java

…

UriAuthenticationPolicyAdapter.java

…

UserCredentialsPreferenceController.java

…

VisiblePatternProfilePreferenceController.java

Clean up FeatureFactory.getFeature()

2023-08-08 08:41:48 +00:00