Prabal Singh 24278ea0d7 Merge "Use settingslib util methods for work policy info" into tm-dev am: 591c2c3b38 am: 888deb9328 am: c771c8bf94 ...

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

Change-Id: Id1559aa87be9958b82e11395ec49df91baafe3c3
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2022-04-25 08:28:46 +00:00

..

ActionDisabledByAdminDialog.java

Fetch admin details if not present in Intent.

2021-09-16 12:13:21 +00:00

ActionDisabledByAdminDialogHelper.java

RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class

2022-03-17 17:37:45 +00:00

ActionDisabledLearnMoreButtonLauncherImpl.java

Further refactoring on ActionDisabledByAdminDialog classes.

2021-05-27 11:27:33 -07:00

AdminActionPreferenceControllerBase.java

RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class

2022-03-17 17:37:45 +00:00

AdminGrantedCameraPermissionPreferenceController.java

Remove DynamicAvailabilityPreferenceController.

2017-11-07 12:58:48 -08:00

AdminGrantedLocationPermissionsPreferenceController.java

Remove DynamicAvailabilityPreferenceController.

2017-11-07 12:58:48 -08:00

AdminGrantedMicrophonePermissionPreferenceController.java

Remove DynamicAvailabilityPreferenceController.

2017-11-07 12:58:48 -08:00

AdminGrantedPermissionsPreferenceControllerBase.java

Sort imports

2018-08-28 22:13:15 +00:00

AlwaysOnVpnCurrentUserPreferenceController.java

RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class

2022-03-17 17:37:45 +00:00

AlwaysOnVpnManagedProfilePreferenceController.java

Remove DynamicAvailabilityPreferenceController.

2017-11-07 12:58:48 -08:00

ApplicationListFragment.java

Allow overriding of strings referenced in XML files.

2022-02-07 21:00:05 +00:00

ApplicationListPreferenceController.java

Refactor AppPreference and AppSwitchPreference

2021-01-05 18:27:08 +00:00

BugReportsPreferenceController.java

…

CaCertsCurrentUserPreferenceController.java

RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class

2022-03-17 17:37:45 +00:00

CaCertsManagedProfilePreferenceController.java

Reorder and clean up imports.

2018-06-18 15:45:09 -07:00

CaCertsPreferenceControllerBase.java

Sort imports

2018-08-28 22:13:15 +00:00

DeviceAdminStringProviderImpl.java

RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class

2022-03-17 17:37:45 +00:00

EnterpriseInstalledPackagesPreferenceController.java

Sort imports

2018-08-28 22:13:15 +00:00

EnterprisePrivacyFeatureProvider.java

Don't start DPC with the FLAG_ACTIVITY_NEW_TASK flag

2021-10-07 19:27:38 +01:00

EnterprisePrivacyFeatureProviderImpl.java

Use settingslib util methods for work policy info

2022-04-23 20:35:41 +01:00

EnterprisePrivacyPreferenceController.java

Refactor some Preference Controllers to use BasePreferenceController

2022-01-10 13:25:13 +00:00

EnterprisePrivacySettings.java

Update Privacy Settings text for a financed device

2021-03-23 16:06:01 +00:00

EnterpriseSetDefaultAppsListFragment.java

Revert "Settings search - Navigate user to exact page"

2020-01-16 14:07:38 +08:00

EnterpriseSetDefaultAppsListPreferenceController.java

RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class

2022-03-17 17:37:45 +00:00

EnterpriseSetDefaultAppsPreferenceController.java

Sort imports

2018-08-28 22:13:15 +00:00

FailedPasswordWipeCurrentUserPreferenceController.java

Remove DynamicAvailabilityPreferenceController.

2017-11-07 12:58:48 -08:00

FailedPasswordWipeManagedProfilePreferenceController.java

Remove DynamicAvailabilityPreferenceController.

2017-11-07 12:58:48 -08:00

FailedPasswordWipePreferenceControllerBase.java

Sort imports

2018-08-28 22:13:15 +00:00

FinancedPrivacyPreferenceController.java

Refactor some Preference Controllers to use BasePreferenceController

2022-01-10 13:25:13 +00:00

GlobalHttpProxyPreferenceController.java

Remove ConnectivityManager from EnterprisePrivacyFeatureProvider.

2021-02-18 16:44:53 +09:00

ImePreferenceController.java

RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class

2022-03-17 17:37:45 +00:00

ManageDeviceAdminPreferenceController.java

RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class

2022-03-17 17:37:45 +00:00

NetworkLogsPreferenceController.java

…

OWNERS

Update OWNERS file for enterprise modules in Settings

2022-04-13 17:08:07 +01:00

PrivacyPreferenceControllerHelper.java

RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class

2022-03-17 17:37:45 +00:00

PrivacySettingsEnterprisePreference.java

Update Privacy Settings text for a financed device

2021-03-23 16:06:01 +00:00

PrivacySettingsFinancedPreference.java

Update financed device info screen

2022-02-07 16:58:26 -08:00

PrivacySettingsPreference.java

Update Privacy Settings text for a financed device

2021-03-23 16:06:01 +00:00

PrivacySettingsPreferenceFactory.java

Update Privacy Settings text for a financed device

2021-03-23 16:06:01 +00:00

SecurityLogsPreferenceController.java

…