Tony Mantler
1890a9bca8
Merge "Move hint strings to SettingsLib" into nyc-dev am: 829d517
...
am: 1721681
2016-03-22 16:27:56 +00:00
Tony Mantler
172168131a
Merge "Move hint strings to SettingsLib" into nyc-dev
...
am: 829d517
2016-03-22 16:24:49 +00:00
Tony Mantler
829d5173d8
Merge "Move hint strings to SettingsLib" into nyc-dev
2016-03-22 16:16:14 +00:00
Nathan Harold
63859ab2c0
Fix Crash in the WiFi Status Test Menu am: 582b287
...
am: 19acb87
2016-03-22 02:27:18 +00:00
Nathan Harold
19acb87506
Fix Crash in the WiFi Status Test Menu
...
am: 582b287
2016-03-22 02:24:29 +00:00
Nathan Harold
582b287595
Fix Crash in the WiFi Status Test Menu
...
-Remove fragments of the defunct/removed ip-address ping test
-Update a dangling resource reference
Bug: 27771038
Change-Id: Ib26eb6427eb6fbe6ef2d1f235277af3d2e8093f1
2016-03-21 23:22:55 +00:00
Tony Mantler
50124b5fee
Move hint strings to SettingsLib
...
b/18246360
Change-Id: I7b8f6badde4e0a4d47c408e2acb70ae3fe8557a9
2016-03-21 14:51:55 -07:00
Tony Mak
b70f3b03e5
Merge "Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible" into nyc-dev am: 147fa9f
...
am: 1a7d856
2016-03-21 15:28:15 +00:00
Victor Chang
f2ad4b1ffd
Merge "Per vpn setting change in VPN list" into nyc-dev am: 32da1ec
...
am: d0fc82f
2016-03-21 15:28:15 +00:00
Tony Mak
1a7d856984
Merge "Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible" into nyc-dev
...
am: 147fa9f
2016-03-21 15:25:39 +00:00
Victor Chang
d0fc82fd66
Merge "Per vpn setting change in VPN list" into nyc-dev
...
am: 32da1ec
2016-03-21 15:25:39 +00:00
Tony Mak
147fa9f542
Merge "Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible" into nyc-dev
2016-03-21 15:20:34 +00:00
Victor Chang
32da1ecdca
Merge "Per vpn setting change in VPN list" into nyc-dev
2016-03-21 15:20:14 +00:00
Geoff Mendal
5fe8495b9f
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 6aad5a1 -s ours
...
am: 6c1a8ae
2016-03-21 14:54:49 +00:00
Geoff Mendal
6c1a8ae669
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 6aad5a1
2016-03-21 14:52:33 +00:00
Geoff Mendal
6aad5a1bda
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-03-21 14:41:10 +00:00
Geoff Mendal
92046e2274
Import translations. DO NOT MERGE
...
Change-Id: Ie958cde80e3f06203380e8f77f67faff9259bd6b
Auto-generated-cl: translation import
2016-03-21 07:40:16 -07:00
Geoff Mendal
288e1d1682
Merge "Import translations. DO NOT MERGE"
2016-03-21 13:47:06 +00:00
Geoff Mendal
da970e6c7d
Import translations. DO NOT MERGE
...
Change-Id: I85c85f558c3aa45ea3242df019597b1cedaf17d7
Auto-generated-cl: translation import
2016-03-21 06:31:50 -07:00
Victor Chang
3ea5630690
Merge "Vpn settings per vpn" into nyc-dev am: df21cc7
...
am: dcb3f2f
2016-03-21 13:18:51 +00:00
Victor Chang
dcb3f2f3fd
Merge "Vpn settings per vpn" into nyc-dev
...
am: df21cc7
2016-03-21 13:16:29 +00:00
Victor Chang
df21cc7de9
Merge "Vpn settings per vpn" into nyc-dev
2016-03-21 13:09:07 +00:00
Victor Chang
14c2ac4dcb
Per vpn setting change in VPN list
...
- Show admin support details when user taps on a cell and user restriction is on
- Show always-on-vpn active status in preference summary
- User can still open non-configurable per-VPN info page even when user restriction is applied
- Rename ConfigPreference to LegacyVpnPreference
- Move summary String handling into ManageablePreference
- ManageablePreference inherits GearPreference to reuse the code
- Don't show disconnect dialog when always-on is enabled
BUG=26950700
Change-Id: I37b087879cf3b674df528e7787d7bb1eead3310f
2016-03-21 12:36:44 +00: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
Mahaver Chopra
8b64b1a65a
Merge "User should confirm device lock before un-unifying" into nyc-dev am: ad1b7f6
...
am: a4474c7
2016-03-21 11:20:17 +00:00
Mahaver Chopra
a4474c7286
Merge "User should confirm device lock before un-unifying" into nyc-dev
...
am: ad1b7f6
2016-03-21 11:17:58 +00:00
Clara Bayarri
ad1b7f6113
Merge "User should confirm device lock before un-unifying" into nyc-dev
2016-03-21 11:12:20 +00:00
Geoff Mendal
cad4684d40
Merge "Import translations. DO NOT MERGE"
2016-03-19 03:57:40 +00:00
Geoff Mendal
bddb7deb7a
Import translations. DO NOT MERGE
...
Change-Id: Ia02626660408f6f177ca4d052cbc03eb26c0a871
Auto-generated-cl: translation import
2016-03-18 20:52:22 -07:00
Geoff Mendal
7c2095c048
Import translations. DO NOT MERGE am: 5f96b25 -s ours
...
am: 670a9c7
2016-03-19 03:24:34 +00:00
Geoff Mendal
670a9c7b98
Import translations. DO NOT MERGE
...
am: 5f96b25
2016-03-19 03:21:56 +00:00
Geoff Mendal
5f96b25dae
Import translations. DO NOT MERGE
...
Change-Id: I2683d49e5f8a7beaa6eb6ee88265cda4fae9a2ca
Auto-generated-cl: translation import
2016-03-19 04:17:38 +01:00
Anna Galusza
533b955766
Merge "Stops black screen from being displayed on changing Vision Settings in SUW. Bug: 27328791" into nyc-dev am: e9b5d59
...
am: 77e429b
2016-03-18 21:44:24 +00:00
Anna Galusza
77e429b27e
Merge "Stops black screen from being displayed on changing Vision Settings in SUW. Bug: 27328791" into nyc-dev
...
am: e9b5d59
2016-03-18 21:41:30 +00:00
Anna Galusza
e9b5d5980b
Merge "Stops black screen from being displayed on changing Vision Settings in SUW. Bug: 27328791" into nyc-dev
2016-03-18 21:32:52 +00:00
Mahaver Chopra
26632097ba
User should confirm device lock before un-unifying
...
User should confirm device lock before un-unifying
Move Use the same lock toggle the first option
When Unifying Title while confirming device password is of profile.
Bug: 26815727
Bug: 27523804
Bug: 27547551
Change-Id: I44857f7dcff3d68486e7e4d2ae8565b56d7c91b7
2016-03-18 19:36:47 +00:00
Tony Mak
a7b25f9e71
Merge "Should read specific user\'s password restriction" into nyc-dev am: 2bfbcfa
...
am: d1af8c2
2016-03-18 18:57:00 +00:00
Tony Mak
ac3471c7b9
Clear mHasResult if the result is dispatched am: b27d5b2
...
am: b03e5ec
2016-03-18 18:57:00 +00:00
Tony Mak
d1af8c2d6a
Merge "Should read specific user\'s password restriction" into nyc-dev
...
am: 2bfbcfa
2016-03-18 18:54:45 +00:00
Tony Mak
b03e5ece2d
Clear mHasResult if the result is dispatched
...
am: b27d5b2
2016-03-18 18:54:45 +00:00
Tony Mak
2bfbcfae13
Merge "Should read specific user's password restriction" into nyc-dev
2016-03-18 18:51:58 +00:00
Tony Mak
b27d5b2007
Clear mHasResult if the result is dispatched
...
The bug is because we dispatch the result again in setListener.
We should reset mHasResult if the result is dispatched already.
This bug is actually not work-challenge specific, I can reproduce it
in the setting to change screen lock.
Bug: 27242673
Change-Id: I29d2769a16c53d7103dafe1811bc808d634a8d85
2016-03-18 18:44:57 +00:00
Jason Monk
ceba2863b5
Merge "Fix bluetooth device forgetting" into nyc-dev am: b56d3a6
...
am: 87e213b
2016-03-18 18:22:03 +00:00
Jason Monk
87e213b8df
Merge "Fix bluetooth device forgetting" into nyc-dev
...
am: b56d3a6
2016-03-18 18:19:47 +00:00
Jason Monk
b56d3a6c33
Merge "Fix bluetooth device forgetting" into nyc-dev
2016-03-18 18:13:47 +00:00
Jason Monk
38d8fc0f86
Fix bluetooth device forgetting
...
Bug: 27476922
Change-Id: I8c5b7076a04185371311fb4ff1c1ba0df0df19dc
2016-03-18 14:11:25 -04:00
Anna Galusza
416f72b36c
Stops black screen from being displayed on changing Vision Settings in SUW.
...
Bug: 27328791
Change-Id: Ied247c3a31dfc50c0113667e63aea4a0c771f7bc
2016-03-18 10:18:36 -07:00
mariagpuyol
9363dd0a9a
Merge "Remove emergency info subtitle" into nyc-dev am: db15d8e
...
am: 251e7dc
2016-03-18 15:46:36 +00:00
mariagpuyol
251e7dc996
Merge "Remove emergency info subtitle" into nyc-dev
...
am: db15d8e
2016-03-18 15:43:57 +00:00
Abodunrinwa Toki
37ece2770d
Merge "Work challenge background: Fix top padding" into nyc-dev am: 4873230
...
am: 153ce15
2016-03-18 15:41:40 +00:00
