SongFerng Wang 7f29649aa9 Merge "Remove the owner" am: 286344d539 am: 448c8b61a8 am: 61ef9024c8 ...

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

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

2023-06-14 07:54:48 +00:00

..

AdvancedVpnFeatureProvider.java

RESTRICT AUTOMERGE Refactoring settings UI

2022-10-11 04:30:09 +00:00

AdvancedVpnFeatureProviderImpl.java

RESTRICT AUTOMERGE Refactoring settings UI

2022-10-11 04:30:09 +00:00

AppDialog.java

…

AppDialogFragment.java

Prevent disconnecting admin-configured VPN

2021-03-31 15:20:11 +00:00

AppManagementFragment.java

Modify the MetricsCategory as VPN_APP_MANAGEMENT

2023-05-26 12:50:14 +08:00

AppPreference.java

[Settings] Limit height of TextView when text too long

2023-01-10 07:36:21 +00:00

AppVpnInfo.java

Fix errorprone warnings that should be errors

2022-10-23 12:41:39 -07:00

ConfigDialog.java

Populate ipsecSecret field in VpnProfile

2023-04-13 07:47:53 +00:00

ConfigDialogFragment.java

…

ConfirmLockdownFragment.java

…

LegacyVpnPreference.java

…

ManageablePreference.java

[Settings] Limit height of TextView when text too long

2023-01-10 07:36:21 +00:00

OWNERS

Merge "Remove the owner" am: 286344d539 am: 448c8b61a8 am: 61ef9024c8

2023-06-14 07:54:48 +00:00

VpnInfoPreference.java

Connect VPN warning help icon with the network & internet page.

2021-03-24 01:07:28 +00:00

VpnSettings.java

RESTRICT AUTOMERGE Refactoring settings UI

2022-10-11 04:30:09 +00:00

VpnUtils.java

…