OSDN Git Service

Improved always_on_vpn disabled text
authorAndre Lago <andrelago@google.com>
Tue, 19 Jul 2016 14:26:34 +0000 (15:26 +0100)
committerAndre Lago <andrelago@google.com>
Wed, 20 Jul 2016 09:51:30 +0000 (10:51 +0100)
commitf22679abbc5154b02e89c3a99ddb2097db05c3e0
treeb462d570343034cb1f5c5749aaea5faac2c6a6c9
parent6263c2f6d434692f4088402bde2bed0e6c9e2e80
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
res/values/strings.xml
res/xml/vpn_app_management.xml