Automerger Merge Worker
0f1d7d33ee
Merge "[automerger skipped] Merge "Hide IKEv2 VPN options if not supported" into rvc-dev am: 5e2f733aee am: d7a50cb62f -s ours" into rvc-d1-dev-plus-aosp am: 0a1b12278a -s ours
...
am skip reason: Change-Id I3ef2e6144371596380351341e58c4ee84d49f39d with SHA-1 149cd3dd77
2020-05-27 18:09:29 +00:00
Adam Bookatz
62a3dea883
Merge "Opening Multiuser doesn't toggle it on" into rvc-dev am: f8fd6156ae am: dcd4edc456 am: 0c794f99fd
...
Change-Id: I5de59ff16db60f367d53142fe658627343d3f08a
2020-05-27 18:08:33 +00:00
Benedict Wong
7242fdf8e4
[automerger skipped] Merge "Hide IKEv2 VPN options if not supported" into rvc-dev am: 5e2f733aee am: d7a50cb62f am: d6cb162baa -s ours
...
am skip reason: Change-Id I3ef2e6144371596380351341e58c4ee84d49f39d with SHA-1 ad2421fe5b
2020-05-27 18:06:45 +00:00
Adam Bookatz
39b6aface6
Merge "Opening Multiuser doesn't toggle it on" into rvc-dev am: f8fd6156ae am: 43e7fa6d51 am: 9fc127810a
...
Change-Id: I1b3660569c1033fc77c6181aab07144c9796f9a8
2020-05-27 18:06:00 +00:00
Adam Bookatz
3e45415f0c
Merge "Opening Multiuser doesn't toggle it on" into rvc-dev am: f8fd6156ae am: 43e7fa6d51 am: 325e71b897
...
Change-Id: Ia27c2491e7cc34f5bd7ea3b45f4c54dffc801921
2020-05-27 18:05:26 +00:00
Benedict Wong
a89340bf43
[automerger skipped] Merge "Hide IKEv2 VPN options if not supported" into rvc-dev am: 5e2f733aee -s ours am: 03bf3af139 -s ours
...
am skip reason: Change-Id I3ef2e6144371596380351341e58c4ee84d49f39d with SHA-1 149cd3dd77
2020-05-27 17:57:56 +00:00
Benedict Wong
d6cb162baa
Merge "Hide IKEv2 VPN options if not supported" into rvc-dev am: 5e2f733aee am: d7a50cb62f
...
Change-Id: Ie6e868708b7f065de64da941ae34d79c91934dfe
2020-05-27 17:56:30 +00:00
Automerger Merge Worker
0a1b12278a
Merge "[automerger skipped] Merge "Hide IKEv2 VPN options if not supported" into rvc-dev am: 5e2f733aee am: d7a50cb62f -s ours" into rvc-d1-dev-plus-aosp
2020-05-27 17:56:18 +00:00
Benedict Wong
b4f572cfdc
[automerger skipped] Merge "Hide IKEv2 VPN options if not supported" into rvc-dev am: 5e2f733aee am: d7a50cb62f -s ours
...
am skip reason: Change-Id I3ef2e6144371596380351341e58c4ee84d49f39d with SHA-1 ad2421fe5b
2020-05-27 17:56:14 +00:00
Adam Bookatz
0c794f99fd
Merge "Opening Multiuser doesn't toggle it on" into rvc-dev am: f8fd6156ae am: dcd4edc456
...
Change-Id: I3466d9db2cc0003fbdeef134ebe031c61485f76b
2020-05-27 17:55:57 +00:00
Adam Bookatz
9fc127810a
Merge "Opening Multiuser doesn't toggle it on" into rvc-dev am: f8fd6156ae am: 43e7fa6d51
...
Change-Id: I72f7e144a25dd679f138e048e8ec4be685c824d5
2020-05-27 17:55:44 +00:00
Adam Bookatz
325e71b897
Merge "Opening Multiuser doesn't toggle it on" into rvc-dev am: f8fd6156ae am: 43e7fa6d51
...
Change-Id: Ic289a592535de3d7bd5bcff5b7ab4d01faaabd9b
2020-05-27 17:55:21 +00:00
Benedict Wong
d7a50cb62f
Merge "Hide IKEv2 VPN options if not supported" into rvc-dev am: 5e2f733aee
...
Change-Id: Ifad4d14eb356a70d1a4eb5a543219b9d1eb3b852
2020-05-27 17:33:14 +00:00
Benedict Wong
03bf3af139
[automerger skipped] Merge "Hide IKEv2 VPN options if not supported" into rvc-dev am: 5e2f733aee -s ours
...
am skip reason: Change-Id I3ef2e6144371596380351341e58c4ee84d49f39d with SHA-1 ad2421fe5b
2020-05-27 17:33:02 +00:00
Adam Bookatz
43e7fa6d51
Merge "Opening Multiuser doesn't toggle it on" into rvc-dev am: f8fd6156ae
...
Change-Id: I0df967353ef0dd28f75e91d210bd50b0eaf74a14
2020-05-27 17:33:00 +00:00
Adam Bookatz
dcd4edc456
Merge "Opening Multiuser doesn't toggle it on" into rvc-dev am: f8fd6156ae
...
Change-Id: I33a68598516d6a7e1537e899ef173b6f46114171
2020-05-27 17:32:20 +00:00
Edgar Wang
2ee4df2af5
Remove duplicate search result when search "Bubbles"
...
Bug: 155846034
Test: manual
Change-Id: I08333a6af9354ef5af3e7f3c20aaeb5c2e2453e2
2020-05-28 01:31:05 +08:00
Benedict Wong
5e2f733aee
Merge "Hide IKEv2 VPN options if not supported" into rvc-dev
2020-05-27 17:31:02 +00:00
Adam Bookatz
f8fd6156ae
Merge "Opening Multiuser doesn't toggle it on" into rvc-dev
2020-05-27 17:15:33 +00:00
Chen Xu
6faaeb6bfc
Merge "AOSP Cellbroadcast renaming"
2020-05-27 16:13:38 +00:00
Julia Reynolds
ef4c044053
Some notification history fixes
...
- Update header count when item swiped away
- Clean up container when last notification is swiped away
- Long pressing on the top two section brings you to settings to
modify notification behavior
- Show more notification content
Test: manual
Bug: 157547283
Change-Id: I1d43cacca7a0f22f83cef9187cf288839e0d5795
2020-05-27 09:45:32 -04:00
TreeHugger Robot
80d919c1fc
Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659 am: ebef186155 am: 5763102add am: fb022cc32c
...
Change-Id: Iae17e86761a5d87494944d98d2728f25e8e89d03
2020-05-27 12:38:12 +00:00
Automerger Merge Worker
c0a64db2e2
Merge "Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659 am: e3e2ce74f7 am: e56caf1577" into rvc-qpr-dev-plus-aosp am: b75144e7e5
...
Change-Id: I158f2233f6aa4bbb291250fdabef1dae39ed65af
2020-05-27 12:37:51 +00:00
TreeHugger Robot
bcf9d9e97f
Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659 am: e3e2ce74f7 am: a9df21b508 am: 43a459cb1b
...
Change-Id: I0ffcb7bfd8fed9aa2f769a144e1c33c330d7c9ff
2020-05-27 12:37:04 +00:00
TreeHugger Robot
fb022cc32c
Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659 am: ebef186155 am: 5763102add
...
Change-Id: I3b236ef65dd5291c1ca562fb73c073fa08ab9ea4
2020-05-27 12:17:46 +00:00
Automerger Merge Worker
b75144e7e5
Merge "Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659 am: e3e2ce74f7 am: e56caf1577" into rvc-qpr-dev-plus-aosp
2020-05-27 12:17:40 +00:00
TreeHugger Robot
5942096e2f
Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659 am: e3e2ce74f7 am: e56caf1577
...
Change-Id: I78038830aba9608d9f6d9bf75eca0a37fcddee41
2020-05-27 12:17:28 +00:00
TreeHugger Robot
43a459cb1b
Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659 am: e3e2ce74f7 am: a9df21b508
...
Change-Id: Ife00386ab5045ed1121707a202308e35b56404ee
2020-05-27 12:17:11 +00:00
TreeHugger Robot
5763102add
Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659 am: ebef186155
...
Change-Id: Ib8cb46616fa412f4ad0d8e4a73858f3f08972f52
2020-05-27 12:06:29 +00:00
TreeHugger Robot
e56caf1577
Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659 am: e3e2ce74f7
...
Change-Id: Ibbe7b902e7e0a618a607059a33e94f42cbc30df6
2020-05-27 12:05:08 +00:00
TreeHugger Robot
a9df21b508
Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659 am: e3e2ce74f7
...
Change-Id: I1bd4fa1d60bf9362541c7a2e8227c2f84ca940f1
2020-05-27 12:05:07 +00:00
Stanley Wang
c5bac19d25
Merge "Fix the search result "Google Account" doesn't work." into rvc-dev am: 12e3efcb04 am: f86897477c am: 308b5f0efd am: 7f2598c52a
...
Change-Id: I0c856b4a964ee92f42a7e39ae3c55fad82954b9f
2020-05-27 11:55:56 +00:00
Automerger Merge Worker
b2bc7f54c3
Merge "Merge "Fix the search result "Google Account" doesn't work." into rvc-dev am: 12e3efcb04 am: a17be1f732 am: c83abc4906" into rvc-qpr-dev-plus-aosp am: 1467812913
...
Change-Id: I2f13e1c8eba6dbabed05385920f153947a6f9594
2020-05-27 11:55:42 +00:00
TreeHugger Robot
e3e2ce74f7
Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659
...
Change-Id: Icf1d67fe6a49b14e3bebb19ff4f8c3a3a691b09f
2020-05-27 11:55:38 +00:00
TreeHugger Robot
ebef186155
Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659
...
Change-Id: Ifef1e319dacc0d12c4ae7d162d221daa0a342597
2020-05-27 11:55:38 +00:00
Stanley Wang
d5b08e8959
Merge "Fix the search result "Google Account" doesn't work." into rvc-dev am: 12e3efcb04 am: a17be1f732 am: ae8cdee154 am: f6398a09fa
...
Change-Id: I0b3774f7cb8ab6d242446a7d757549c7c84d7751
2020-05-27 11:55:22 +00:00
Stanley Wang
7f2598c52a
Merge "Fix the search result "Google Account" doesn't work." into rvc-dev am: 12e3efcb04 am: f86897477c am: 308b5f0efd
...
Change-Id: I23eeb88826967c6acc2399757ce3949e88580755
2020-05-27 11:48:59 +00:00
Automerger Merge Worker
1467812913
Merge "Merge "Fix the search result "Google Account" doesn't work." into rvc-dev am: 12e3efcb04 am: a17be1f732 am: c83abc4906" into rvc-qpr-dev-plus-aosp
2020-05-27 11:48:51 +00:00
Stanley Wang
f6398a09fa
Merge "Fix the search result "Google Account" doesn't work." into rvc-dev am: 12e3efcb04 am: a17be1f732 am: ae8cdee154
...
Change-Id: I415a1fdce3245a313479331e9e37417525a24daa
2020-05-27 11:48:46 +00:00
Stanley Wang
ce77310aae
Merge "Fix the search result "Google Account" doesn't work." into rvc-dev am: 12e3efcb04 am: a17be1f732 am: c83abc4906
...
Change-Id: Icec18853c7e234506e2b0c04abf6e1cd3b4cfe5e
2020-05-27 11:48:41 +00:00
TreeHugger Robot
4d44702659
Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev
2020-05-27 11:36:45 +00:00
Stanley Wang
308b5f0efd
Merge "Fix the search result "Google Account" doesn't work." into rvc-dev am: 12e3efcb04 am: f86897477c
...
Change-Id: Iffa0ca3bce76407c9e233f1131c4875b59667fb9
2020-05-27 11:34:16 +00:00
Stanley Wang
c83abc4906
Merge "Fix the search result "Google Account" doesn't work." into rvc-dev am: 12e3efcb04 am: a17be1f732
...
Change-Id: Icba85289fb428f8c5e36aa0b76a95e91364ff7d7
2020-05-27 11:34:10 +00:00
Stanley Wang
ae8cdee154
Merge "Fix the search result "Google Account" doesn't work." into rvc-dev am: 12e3efcb04 am: a17be1f732
...
Change-Id: I32e4a644e300109376a5f2b8a719250f6cc6cd27
2020-05-27 11:34:08 +00:00
Stanley Wang
a17be1f732
Merge "Fix the search result "Google Account" doesn't work." into rvc-dev am: 12e3efcb04
...
Change-Id: I7f9508b3d8487900655526ea1544306e8c58a7d9
2020-05-27 11:20:28 +00:00
Stanley Wang
f86897477c
Merge "Fix the search result "Google Account" doesn't work." into rvc-dev am: 12e3efcb04
...
Change-Id: Ia8dd974c1c6f3d2fd1de6b67c0fe76a0407c02e5
2020-05-27 11:20:28 +00:00
Stanley Wang
12e3efcb04
Merge "Fix the search result "Google Account" doesn't work." into rvc-dev
2020-05-27 11:12:02 +00:00
Benedict Wong
149cd3dd77
Hide IKEv2 VPN options if not supported
...
This change hides the VPN type options if the FEATURE_IPSEC_TUNNELS is
not supported on the device.
Bug: 156681625
Test: Manually tested
Change-Id: I3ef2e6144371596380351341e58c4ee84d49f39d
Merged-In: I3ef2e6144371596380351341e58c4ee84d49f39d
(cherry picked from commit e37fb7fc00
2020-05-27 09:22:54 +00:00
Sunny Shao
ee4ec4b33f
Enable the filterTouchesWhenObscured in Special app access
...
- Enable the filterTouchesWhenObscured attribute on all toggle
switches in all pages of the special app access
Fixes: 155288585
Test: make RunSettingsRoboTests
Change-Id: I011cfe4b7e4e624a8338332ac47a353f7f3ab661
2020-05-27 17:21:24 +08:00
Edgar Wang
30ae995f96
Merge "Update summary of Gesture" into rvc-dev am: e1a9a56451 am: 4cec7ebd7a am: fdc5f3bf9f am: 51deaa3647
...
Change-Id: Ia033390abc976ad1cd2078df612dddff4b57ffef
2020-05-27 08:57:50 +00:00
