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
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
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
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
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
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
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
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
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
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
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
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
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
Edgar Wang
fdc5f3bf9f
Merge "Update summary of Gesture" into rvc-dev am: e1a9a56451
am: 4cec7ebd7a
...
Change-Id: If6f7d422b3d014e7840af374e54fd8b3c0ed6efd
2020-05-27 08:31:51 +00:00
Automerger Merge Worker
6fd3b32197
Merge "Merge "Update summary of Gesture" into rvc-dev am: e1a9a56451
am: c3ce91706a" into rvc-d1-dev-plus-aosp
2020-05-27 08:31:49 +00:00
Edgar Wang
8de2ab6a66
Merge "Update summary of Gesture" into rvc-dev am: e1a9a56451
am: c3ce91706a
...
Change-Id: I71b4e430f93e7637017a86f0c8c3adcc33d51716
2020-05-27 08:31:43 +00:00
Bonian Chen
8835dd7c3f
Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev am: d9d9a9be8d
am: 1a10069e6a
...
Change-Id: I2580df4b12bf1d4c0017660f6539961996dd3637
2020-05-27 08:31:41 +00:00
Bonian Chen
612e3c409c
Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev am: d9d9a9be8d
am: db253d31d8
...
Change-Id: Ib5cf4d28e58881d0e16a9dc2364353707701a944
2020-05-27 08:31:36 +00:00
Edgar Wang
c3ce91706a
Merge "Update summary of Gesture" into rvc-dev am: e1a9a56451
...
Change-Id: I3240458b67d03283dac6bb15d9fbef02ef7febeb
2020-05-27 08:19:00 +00:00
Edgar Wang
4cec7ebd7a
Merge "Update summary of Gesture" into rvc-dev am: e1a9a56451
...
Change-Id: Ic0649f4c8488bf86ca366b60c468dc0e9dd5ef5f
2020-05-27 08:18:56 +00:00
Bonian Chen
1a10069e6a
Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev am: d9d9a9be8d
...
Change-Id: Ia0af2c7912b6d6af31ba7cb67747f9cd952f4428
2020-05-27 08:18:36 +00:00
Bonian Chen
db253d31d8
Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev am: d9d9a9be8d
...
Change-Id: I06a1e5612384f99dea432ca90058269a661f4c4a
2020-05-27 08:18:32 +00:00
Edgar Wang
e1a9a56451
Merge "Update summary of Gesture" into rvc-dev
2020-05-27 08:14:17 +00:00
Bonian Chen
d9d9a9be8d
Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev
2020-05-27 08:08:35 +00:00
Automerger Merge Worker
88a7bfdc96
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8b32bee65b
-s ours am: 16f777f19d
-s ours" into rvc-d1-dev-plus-aosp
2020-05-27 07:12:57 +00:00