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
Oleksandr Peletskyi
7aeb56ce6b
Block "Screen lock" menu for Work Challenge.
...
For Work Challenge feature "Screen lock" menu item for managed
profile is completely disabled in case, if
PASSWORD_QUALITY_MANAGED is set and user choose not to use
the same lock.
BUG: 25549437
Change-Id: I201aecb91ba8c2868e57e2014d125b149aeac377
2016-03-21 14:45:50 +01: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
bddb7deb7a
Import translations. DO NOT MERGE
...
Change-Id: Ia02626660408f6f177ca4d052cbc03eb26c0a871
Auto-generated-cl: translation import
2016-03-18 20:52:22 -07: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
Hall Liu
cbde0b8afd
Add indicator for system dialer in Settings
...
Bug: 26748630
Change-Id: I60b9f2783fb4c1f49c79449dd150132c73a9fb2a
2016-03-18 16:49:16 -07: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
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
Maria Garcia Puyol
da497f26d7
Revert "Dialog for emergency info"
...
This reverts commit ae49edbdfd
2016-03-17 22:52:44 +00:00
Sudheer Shanka
e2b2c3ffe4
Add more policy transparency for wifi settings.
...
Show policy transparency dialog if user tries to modify a
wifi configuration locked by device owner.
Bug: 27375948
Change-Id: I504082282f57bc5de9f097e962d195ecd2cc9da4
2016-03-17 15:35:15 -07:00
Sudheer Shanka
2b6e283da7
Merge "Fix string typo." into nyc-dev am: d0145cc
...
am: feed83f
2016-03-17 21:52:22 +00:00
Sudheer Shanka
feed83f7a3
Merge "Fix string typo." into nyc-dev
...
am: d0145cc
2016-03-17 21:49:50 +00:00
Xiaohui Chen
0e53e9a8ae
Merge "fix build for ag/887244" into nyc-dev am: e7359ee
...
am: a4da112
2016-03-17 21:45:07 +00:00
Xiaohui Chen
a4da11246f
Merge "fix build for ag/887244" into nyc-dev
...
am: e7359ee
2016-03-17 21:42:23 +00:00
Sudheer Shanka
d0145cc87a
Merge "Fix string typo." into nyc-dev
2016-03-17 21:41:43 +00:00
Mahaver Chopra
e7359eee4c
Merge "fix build for ag/887244" into nyc-dev
2016-03-17 21:37:20 +00:00
Anna Galusza
0dfec6f5e1
Merge "Add divider below summary text on A11y SUW hub. Bug: 27066012" into nyc-dev am: a6b76bc
...
am: a7df8a7
2016-03-17 21:30:39 +00:00
Anna Galusza
a7df8a7c1b
Merge "Add divider below summary text on A11y SUW hub. Bug: 27066012" into nyc-dev
...
am: a6b76bc
2016-03-17 21:27:42 +00:00
Anna Galusza
a6b76bc407
Merge "Add divider below summary text on A11y SUW hub. Bug: 27066012" into nyc-dev
2016-03-17 21:20:34 +00:00
Anna Galusza
6a2a53e94d
Add divider below summary text on A11y SUW hub.
...
Bug: 27066012
Change-Id: Ic545a50ec2a0b5b7a40152ea818bd15673c629d2
2016-03-17 14:20:02 -07:00
Xiaohui Chen
e4649dde7f
fix build for ag/887244
...
Change-Id: Iaa57eff6d1c9117d3ed55420712e7c6db6d2aa88
2016-03-17 20:41:03 +00:00
Sudheer Shanka
9a958bae30
Fix string typo.
...
Bug: 27627894
Change-Id: I6039acd69363a3827e42e5efda23123af6dfd1c1
2016-03-17 13:18:32 -07:00
Udam Saini
0be44a2ccf
Merge "Sets the divider style to either for fingerprint." into nyc-dev am: 4c173cb
...
am: 2607f55
2016-03-17 20:09:06 +00:00
Udam Saini
2607f5516c
Merge "Sets the divider style to either for fingerprint." into nyc-dev
...
am: 4c173cb
2016-03-17 20:06:47 +00:00
Udam Saini
4c173cb46e
Merge "Sets the divider style to either for fingerprint." into nyc-dev
2016-03-17 19:59:53 +00:00
Mahaver Chopra
21936f5554
Merge "Title text and input bar should be white" into nyc-dev am: bef02df
...
am: 36e4e7a
2016-03-17 19:32:36 +00:00
Mahaver Chopra
e5dfbf09d0
Merge "Work Profile Security Challenge: Finalised strings" into nyc-dev am: 78a4bcd
...
am: 0ed1e25
2016-03-17 19:32:36 +00:00
Daichi Hirono
d74eaca751
Merge "Use CheckableLinearLayout for Use USB for dialog\'s item." into nyc-dev am: 23f4261
...
am: 9ed9d94
2016-03-17 19:32:35 +00:00
Meng Wang
a154a5d864
Merge "Show ICCID in SIM status, if CarrierConfigManager allows." into nyc-dev am: 2ccf1fd
...
am: 96f2194
2016-03-17 19:32:35 +00:00
Robin Lee
46eb69ac79
Merge "Show "no vpns added" for empty vpn screen" into nyc-dev am: d0979a5
...
am: 8af9a74
2016-03-17 19:32:35 +00:00
Abodunrinwa Toki
af700ec6e0
Work challenge background: Fix top padding
...
Bug: 27693796
Change-Id: Iafda9dfed2b87c3618c155d4434d5895547f6fe0
2016-03-17 18:48:05 +00:00
