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
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
Maria Garcia Puyol
db15d8e21b
Merge "Remove emergency info subtitle" into nyc-dev
2016-03-18 15:37:59 +00:00
Abodunrinwa Toki
153ce15c31
Merge "Work challenge background: Fix top padding" into nyc-dev
...
am: 4873230
2016-03-18 15:37:08 +00:00
Abodunrinwa Toki
4873230326
Merge "Work challenge background: Fix top padding" into nyc-dev
2016-03-18 15:30:01 +00:00
mariagpuyol
1f8665f58a
Remove emergency info subtitle
...
Bug:27621394
Change-Id: I9f2dfd1fd4926cb454cc8e4b7e3f100aa724aa76
2016-03-18 08:13:49 -07:00
Maria Garcia Puyol
125f36e7d4
Merge "Revert "Dialog for emergency info"" into nyc-dev am: c35b08b
...
am: 2aca50b
2016-03-18 15:12:11 +00:00
Maria Garcia Puyol
2aca50b657
Merge "Revert "Dialog for emergency info"" into nyc-dev
...
am: c35b08b
2016-03-18 15:09:53 +00:00
Maria Garcia Puyol
c35b08b4b3
Merge "Revert "Dialog for emergency info"" into nyc-dev
2016-03-18 15:06:02 +00:00
Tony Mak
25c3c54c03
Should read specific user's password restriction
...
Bug: 27330307
Bug: 27543548
Change-Id: I385d190bdd8138f7189c657498f6a55bf84668ea
2016-03-18 14:49:52 +00:00
Philip P. Moltmann
2e45889912
Merge "Correctly compose activity name of add-printer and print-settings activity" into nyc-dev am: 47a9d4f
...
am: f9f4429
2016-03-18 14:37:41 +00:00
Philip P. Moltmann
f9f4429f80
Merge "Correctly compose activity name of add-printer and print-settings activity" into nyc-dev
...
am: 47a9d4f
2016-03-18 14:32:43 +00:00
Ricky Wai
6ced6b79f3
Fix location settings crash when work profile is disabled am: 3bd4771
...
am: b8e660b
2016-03-18 14:30:53 +00:00
Ricky Wai
f765f4a6b4
Merge "Do not connect to KeyChainService when user is not started" into nyc-dev am: ff99bae
...
am: 89d419e
2016-03-18 14:30:52 +00:00
Ricky Wai
b8e660b62f
Fix location settings crash when work profile is disabled
...
am: 3bd4771
2016-03-18 14:26:26 +00:00
Ricky Wai
89d419eb37
Merge "Do not connect to KeyChainService when user is not started" into nyc-dev
...
am: ff99bae
2016-03-18 14:26:26 +00:00
