Commit Graph

67710 Commits

Author SHA1 Message Date
Automerger Merge Worker
ea0f51cc91 Merge "Merge "Remove duplicate search result when search "Bubbles"" into rvc-dev am: 86b5034215 am: 5aa9c97a51 am: e627780301" into rvc-qpr-dev-plus-aosp 2020-05-27 20:08:21 +00:00
TreeHugger Robot
3c7644b0c4 Merge "Remove duplicate search result when search "Bubbles"" into rvc-dev am: 86b5034215 am: 5aa9c97a51 am: e627780301
Change-Id: Idde5db8f6c18fb8be6cbffc4132317139909f05e
2020-05-27 20:08:10 +00:00
TreeHugger Robot
0389ba88de Merge "Remove duplicate search result when search "Bubbles"" into rvc-dev am: 86b5034215 am: 5aa9c97a51 am: 473067cccd
Change-Id: I5e77c7873c34ff035456ba5c7012da80524ed800
2020-05-27 20:08:08 +00:00
TreeHugger Robot
e61ea3a7a0 Merge "Remove duplicate search result when search "Bubbles"" into rvc-dev am: 86b5034215 am: db857cb4f3 am: 204407ac5f
Change-Id: I9ceb9a1dcb5ece95f94223f8630cf54c2494e494
2020-05-27 20:07:44 +00:00
TreeHugger Robot
e627780301 Merge "Remove duplicate search result when search "Bubbles"" into rvc-dev am: 86b5034215 am: 5aa9c97a51
Change-Id: Id445a10fc9a77b0cdf46289e7fbbf438a6497ad1
2020-05-27 19:56:08 +00:00
TreeHugger Robot
204407ac5f Merge "Remove duplicate search result when search "Bubbles"" into rvc-dev am: 86b5034215 am: db857cb4f3
Change-Id: I7d2a1cad7fa4594a37d9abb34ae1967a81615187
2020-05-27 19:55:25 +00:00
TreeHugger Robot
473067cccd Merge "Remove duplicate search result when search "Bubbles"" into rvc-dev am: 86b5034215 am: 5aa9c97a51
Change-Id: I9d919cb43956cd88170cb40a7f9834d7900ee563
2020-05-27 19:55:13 +00:00
TreeHugger Robot
db857cb4f3 Merge "Remove duplicate search result when search "Bubbles"" into rvc-dev am: 86b5034215
Change-Id: I41b7d13a101e794285565c195967e76d35df45f1
2020-05-27 19:38:39 +00:00
TreeHugger Robot
5aa9c97a51 Merge "Remove duplicate search result when search "Bubbles"" into rvc-dev am: 86b5034215
Change-Id: Ic98a47b4767d649e574cf21c7f03aa817b678a0e
2020-05-27 19:38:12 +00:00
TreeHugger Robot
86b5034215 Merge "Remove duplicate search result when search "Bubbles"" into rvc-dev 2020-05-27 19:30:37 +00:00
Benedict Wong
537220db1e [automerger skipped] Merge "Hide IKEv2 VPN options if not supported" into rvc-dev am: 5e2f733aee -s ours am: 03bf3af139 -s ours am: a89340bf43 -s ours
am skip reason: Change-Id I3ef2e6144371596380351341e58c4ee84d49f39d with SHA-1 149cd3dd77 is in history

Change-Id: Ib64d3084d0c86ad92ea3438b3750fcb0e4b75f9f
2020-05-27 18:10:14 +00:00
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 is in history

Change-Id: I0a2c1688c2d99f25a54214d25b8843424d8bae62
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 is in history

Change-Id: I63a19b62247af15b4b861c21de91af670a8b350c
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 is in history

Change-Id: I5aa381f256c38f4e944147184ef03112769d37ed
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 is in history

Change-Id: I15aef8f7428d93a9ec82cc681c837dfe9841b94e
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 is in history

Change-Id: I2e8c9a6c8c997eeeaf3500da74d5c97b7db73eb0
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
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
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
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
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