Chen Xu
357505c6aa
[automerger skipped] Merge "AOSP Cellbroadcast renaming" into rvc-dev am: e7d1c822fc
am: f4d1912123
am: 31c0f50065
-s ours
...
am skip reason: Change-Id Ic38372d96918c17d3cd61832ff668fcfc61f0686 with SHA-1 c2ee364f6f
is in history
Change-Id: If6901e36b5441b048d57514a390b25b7deed1cfe
2020-05-28 02:27:57 +00:00
Chen Xu
1e7a1e6838
Merge "AOSP Cellbroadcast renaming" into rvc-dev am: e7d1c822fc
am: f4d1912123
am: eb7d35e2c7
...
Change-Id: I4d6c79aa5ef0fc4afe17058b3840aa5d697871ac
2020-05-28 02:27:36 +00:00
Chen Xu
78c75b1d10
[automerger skipped] Merge "AOSP Cellbroadcast renaming" into rvc-dev am: e7d1c822fc
am: 76f2b27e3b
-s ours
...
am skip reason: Change-Id Ic38372d96918c17d3cd61832ff668fcfc61f0686 with SHA-1 c2ee364f6f
is in history
Change-Id: I374df5fd34ccfea75a04955a232a6f36f48cb904
2020-05-28 02:16:08 +00:00
Chen Xu
eb7d35e2c7
Merge "AOSP Cellbroadcast renaming" into rvc-dev am: e7d1c822fc
am: f4d1912123
...
Change-Id: I5c3253a8ff1b6065da1673363c7f970078b1b823
2020-05-28 02:15:51 +00:00
Chen Xu
31c0f50065
Merge "AOSP Cellbroadcast renaming" into rvc-dev am: e7d1c822fc
am: f4d1912123
...
Change-Id: Id6af021c26a12fb714addb4c14cbe647e3841603
2020-05-28 02:15:36 +00:00
Chen Xu
76f2b27e3b
Merge "AOSP Cellbroadcast renaming" into rvc-dev am: e7d1c822fc
...
Change-Id: I7e2ba395848723900c4596243bb51f75abf915f5
2020-05-28 02:00:05 +00:00
Chen Xu
f4d1912123
Merge "AOSP Cellbroadcast renaming" into rvc-dev am: e7d1c822fc
...
Change-Id: I25cfd0ef5a3b39c3c9e0d66c08912a7ab82902e1
2020-05-28 02:00:03 +00:00
Chen Xu
e7d1c822fc
Merge "AOSP Cellbroadcast renaming" into rvc-dev
2020-05-28 01:46:10 +00:00
TreeHugger Robot
539e7e1fb4
Merge "Some notification history fixes" into rvc-dev am: 69d210c7df
am: 256f070ed0
am: 33beacef89
...
Change-Id: I20a01ccfe1c7d9cfd8ce0dc1ca44669fb68448d1
2020-05-27 21:09:35 +00:00
TreeHugger Robot
644c916bb1
Merge "Some notification history fixes" into rvc-dev am: 69d210c7df
am: 39507de82b
am: 5910536ffe
...
Change-Id: Ieb20d22d3d983ef2a0471cb04e88742db298a99d
2020-05-27 21:09:27 +00:00
TreeHugger Robot
2fbf0c12a1
Merge "Some notification history fixes" into rvc-dev am: 69d210c7df
am: 39507de82b
am: 3e6e83faf9
...
Change-Id: I8312e5776282257c7c2f09e297bcf04da5dca67a
2020-05-27 21:09:15 +00:00
TreeHugger Robot
33beacef89
Merge "Some notification history fixes" into rvc-dev am: 69d210c7df
am: 256f070ed0
...
Change-Id: I480c7cc7e8123c6f83573842e1e8970c79aba7f8
2020-05-27 20:53:49 +00:00
TreeHugger Robot
5910536ffe
Merge "Some notification history fixes" into rvc-dev am: 69d210c7df
am: 39507de82b
...
Change-Id: Id2097ac899c051e44ebf465cc90dcdee5da1247f
2020-05-27 20:53:41 +00:00
TreeHugger Robot
3e6e83faf9
Merge "Some notification history fixes" into rvc-dev am: 69d210c7df
am: 39507de82b
...
Change-Id: Ie27e5abc2b79b89ea77d0308703b5fcbade2a98a
2020-05-27 20:53:26 +00:00
TreeHugger Robot
256f070ed0
Merge "Some notification history fixes" into rvc-dev am: 69d210c7df
...
Change-Id: I7b7eecab337ba84983d37d4a909f5cc1b89c9dad
2020-05-27 20:35:55 +00:00
TreeHugger Robot
39507de82b
Merge "Some notification history fixes" into rvc-dev am: 69d210c7df
...
Change-Id: I122252be30db11ea6030d5d23c353d36b617b059
2020-05-27 20:35:46 +00:00
Chen Xu
c2ee364f6f
AOSP Cellbroadcast renaming
...
As part of mainline effort, AOSP cellbroadcast package name was changed
from com.android.cellbroadcast to com.android.cellbroadcast.module
Bug: 155844209
Test: Manual test
Change-Id: Ic38372d96918c17d3cd61832ff668fcfc61f0686
Merged-in: Ic38372d96918c17d3cd61832ff668fcfc61f0686
2020-05-27 20:25:43 +00:00
TreeHugger Robot
69d210c7df
Merge "Some notification history fixes" into rvc-dev
2020-05-27 20:25:36 +00:00
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