Robin Lee b26ce1e13b resolve merge conflicts of 90f009ebb5 to master ...

Test: make RunSettingsRoboTests
Change-Id: I7f0eece61918c29d33316fa755eca2e8f4deba46

2017-03-27 17:35:57 +01:00

..

AppDialog.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

AppDialogFragment.java

Update package names to work with the proto3 compiler

2016-11-08 14:06:17 +00:00

AppManagementFragment.java

VPN settings: update strings for always-on VPN

2017-03-24 16:02:57 +00:00

AppPreference.java

Be more aggressive caching Vpn preference attrs

2016-04-21 18:04:42 +01:00

AppVpnInfo.java

Show app VPNs in always-on list

2016-01-14 17:17:52 +00:00

ConfigDialog.java

VPN settings: gray out always-on checkbox dynamically

2017-03-22 20:29:46 +00:00

ConfigDialogFragment.java

resolve merge conflicts of cb1968148a to master

2017-01-19 23:58:30 +00:00

ConfirmLockdownFragment.java

Update string: lockdown confirmation dialog title

2017-02-16 19:14:25 +00:00

ConnectivityManagerWrapper.java

Add global HTTP proxy to Privacy Settings page

2017-01-12 20:09:10 +01:00

ConnectivityManagerWrapperImpl.java

Add global HTTP proxy to Privacy Settings page

2017-01-12 20:09:10 +01:00

LegacyVpnPreference.java

VPN screen clean up

2017-03-07 16:21:38 -08:00

ManageablePreference.java

Move GearPreference to widget package.

2017-02-08 16:09:12 -08:00

VpnSettings.java

resolve merge conflicts of 90f009ebb5 to master

2017-03-27 17:35:57 +01:00

VpnUtils.java

resolve merge conflicts of cb1968148a to master

2017-01-19 23:58:30 +00:00