Commit Graph

2 Commits

Author SHA1 Message Date
Andre Lago
f22679abbc Improved always_on_vpn disabled text
When the admin disallowed config vpn, always-on vpn description was
"Disabled by admin", so it was changed to "Controlled by admin" which
suits it better.

Bug: 29265180
Change-Id: If0da6b9ef3ce7179adeda53203c6caf4e3e9a995
2016-07-20 10:51:30 +01:00
Victor Chang
16da2aa450 Vpn settings per vpn
This CL adds a setting for each VPN
- When no_config_vpn user restriction is applied, user can't change anything in the page
- Launch the subsetting activity in the corresponding user to unlock keystore and force work challenge
- Show dialog when user replace always-on-VPN package
- When forget VPN, unset always-on-vpn

TODO: show per-VPN status in VPN list

Change-Id: Ica360ea44117db6a4ecfaed1eec6c188189c246c
2016-03-21 12:36:23 +00:00