Julia Reynolds
08d8254ae0
Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd am: b5d726003f am: 46b8b3b4d2 am: a9b755c116
...
Change-Id: I846795e7be8cea40f26307015d1354aa4dbad23b
2020-03-24 22:29:14 +00:00
Julia Reynolds
558d2759db
Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd am: b5d726003f am: 2c0fbbde8c
...
Change-Id: Iad1d485ebd2ea63d845aea48eb8599e1f81b268b
2020-03-24 22:14:11 +00:00
Julia Reynolds
a9b755c116
Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd am: b5d726003f am: 46b8b3b4d2
...
Change-Id: Id8e3f577e73d5e3bcd813cf9a9c13ed0c672d109
2020-03-24 22:14:05 +00:00
Julia Reynolds
46b8b3b4d2
Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd am: b5d726003f
...
Change-Id: Ib7c68ea80f4fa61b03de5cd72def8cd7b8c499a6
2020-03-24 22:00:27 +00:00
Julia Reynolds
b28c536b89
Merge "Notification history updates" into rvc-dev am: 8d3741fbca am: 31f9705a60 am: 575b3e8aaf am: 1063516bd2
...
Change-Id: Ied0f1d3989ae33c9656cf3e8ae1bcba919163912
2020-03-24 22:00:18 +00:00
Julia Reynolds
2c0fbbde8c
Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd am: b5d726003f
...
Change-Id: Id63a9f0dae4739a0464e00881e1fd4cea9c1ebb6
2020-03-24 21:59:41 +00:00
Julia Reynolds
03c0421dc4
Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd am: 941d437df6 am: cff74feef2
...
Change-Id: I7b561688720aa6927096096da72bca418665a909
2020-03-24 21:52:41 +00:00
Julia Reynolds
3ce7f90453
Merge "Notification history updates" into rvc-dev am: 8d3741fbca am: f611025053 am: 6104923f21
...
Change-Id: I513245de8ad89f8daff684ff6297e0bfc57926c5
2020-03-24 21:52:34 +00:00
Bonian Chen
dcf701efc3
[Settings] Avoid from Settings crash
...
Avoid from crash when null pointer.
Bug: 152336444
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkActivityTest
Change-Id: I77314f697d8a99d77b9f5fe0a48ddbae69634743
2020-03-25 05:48:37 +08:00
Julia Reynolds
cff74feef2
Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd am: 941d437df6
...
Change-Id: I94ef7a1ea9ab9742f2dadd5c057a82e866cb8f10
2020-03-24 21:43:34 +00:00
Julia Reynolds
6104923f21
Merge "Notification history updates" into rvc-dev am: 8d3741fbca am: f611025053
...
Change-Id: If414a68d3c1f058d2e208534c74906bad47556e2
2020-03-24 21:43:15 +00:00
Julia Reynolds
941d437df6
Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd
...
Change-Id: I065eb16003c13ed562242e1d9d2eb5deb6870415
2020-03-24 21:42:44 +00:00
Julia Reynolds
b5d726003f
Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd
...
Change-Id: Icf2ce73480b62fb1853e0798b890cfbcbccc0191
2020-03-24 21:42:03 +00:00
Julia Reynolds
1063516bd2
Merge "Notification history updates" into rvc-dev am: 8d3741fbca am: 31f9705a60 am: 575b3e8aaf
...
Change-Id: I31f18a7bddbfa6f48f27e002e9aedfd57baa64d6
2020-03-24 21:41:45 +00:00
Julia Reynolds
465b7a2c95
Merge "Notification history updates" into rvc-dev am: 8d3741fbca am: 31f9705a60 am: 7cad4c67df
...
Change-Id: I8babab360e43c5b28fd307ea3478510fa3d2d298
2020-03-24 21:41:35 +00:00
Julia Reynolds
79fd5811cd
Merge "Update all conversations screen" into rvc-dev
2020-03-24 21:33:53 +00:00
Julia Reynolds
575b3e8aaf
Merge "Notification history updates" into rvc-dev am: 8d3741fbca am: 31f9705a60
...
Change-Id: Ie8b990fbc370db99e26097612b5d760e51614b75
2020-03-24 21:26:34 +00:00
Julia Reynolds
7cad4c67df
Merge "Notification history updates" into rvc-dev am: 8d3741fbca am: 31f9705a60
...
Change-Id: Iddede304e44b2526287d15a56acda47420855532
2020-03-24 21:25:51 +00:00
Julia Reynolds
f611025053
Merge "Notification history updates" into rvc-dev am: 8d3741fbca
...
Change-Id: Ia281dc883825831c64e9f12b2b5c82e42333e047
2020-03-24 21:17:27 +00:00
Julia Reynolds
31f9705a60
Merge "Notification history updates" into rvc-dev am: 8d3741fbca
...
Change-Id: If1386c89f4e0e90c84d57950351509c2b9a4173f
2020-03-24 21:16:41 +00:00
Julia Reynolds
8d3741fbca
Merge "Notification history updates" into rvc-dev
2020-03-24 21:07:35 +00:00
Julia Reynolds
2f0bd6552c
Update all conversations screen
...
Update text, and filter the lower section to match the new
header
Test: atest
Fixes: 151765526
Change-Id: I5bc052813745908df8602bf397434a76b294ba6c
2020-03-24 19:37:13 +00:00
Philip P. Moltmann
288491c724
Send attributionTag to notification APIs
...
Test: TH
Bug: 136595429
Change-Id: I4a5bb43a4aa5bfd88646771a0d1a2394d40e82e2
2020-03-24 11:46:48 -07:00
Lais Andrade
5695b43077
Add help uri placeholder for vibration settings
...
Fixes: 150915047
Test: manual
Change-Id: I69d26298d953f28639925c45999518a44881a657
2020-03-24 17:21:11 +00:00
Julia Reynolds
8222a9a650
Notification history updates
...
- New strings
- Fix a crash
Test: manual
Fixes: 151833727
Change-Id: I3b0ef5cd9b221be917c71043e5217a43bc5891d0
2020-03-24 09:25:58 -04:00
TreeHugger Robot
da46a71e30
Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 875b0df3dd am: ed3f4c9d98 am: bc63cbf00b
...
Change-Id: I66284bc3fb8652aa233781b32be77778792121f2
2020-03-24 13:23:28 +00:00
Automerger Merge Worker
67cefa4b86
Merge "Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 168fe82aa5" into rvc-d1-dev-plus-aosp am: 0aec76e8ef
...
Change-Id: Ic51e107ede190eab18b52672db751322ec445e3d
2020-03-24 13:11:49 +00:00
TreeHugger Robot
bc63cbf00b
Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 875b0df3dd am: ed3f4c9d98
...
Change-Id: I5341052f7220a84b802fa800aeb86e7195e7e8f0
2020-03-24 13:11:31 +00:00
TreeHugger Robot
a76db9ae4c
Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 875b0df3dd am: 8247c93340
...
Change-Id: Ia544421a79194d127311eb73e55960257862e137
2020-03-24 13:11:30 +00:00
Automerger Merge Worker
0aec76e8ef
Merge "Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 168fe82aa5" into rvc-d1-dev-plus-aosp
2020-03-24 12:49:51 +00:00
TreeHugger Robot
ed3f4c9d98
Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 875b0df3dd
...
Change-Id: I79a8ebd1fd0fe103749fdbc7047b6ce9c7202b4a
2020-03-24 12:49:48 +00:00
TreeHugger Robot
59f6f58fb5
Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 168fe82aa5
...
Change-Id: Id7bf4ef08d686fac188855f200b361ce5b86f0d0
2020-03-24 12:49:47 +00:00
TreeHugger Robot
8247c93340
Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 875b0df3dd
...
Change-Id: I3f58f0252146a954d4d14a9b40e5cd12b50c496b
2020-03-24 12:49:41 +00:00
TreeHugger Robot
168fe82aa5
Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01
...
Change-Id: Ie80135ad3fe7078fee32de117e2c543e7c3de83a
2020-03-24 12:36:43 +00:00
TreeHugger Robot
875b0df3dd
Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01
...
Change-Id: Ie3f31d838d91cf051524e81f1cac87dec0d84add
2020-03-24 12:35:56 +00:00
TreeHugger Robot
87c0179c01
Merge "Re-enable ignored tests" into rvc-dev
2020-03-24 12:22:11 +00:00
Ben Murdoch
39796aae1c
Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 7b2154d996 am: ffc010f55e am: 3e74710b10
...
Change-Id: I838336311d33fde17627f09c7a6a4c1a2774314f
2020-03-24 11:28:47 +00:00
Automerger Merge Worker
ae81e35a61
Merge "Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 7b2154d996" into rvc-d1-dev-plus-aosp am: 1c4765f6ee
...
Change-Id: I74076b7d10f45a3ca56b39c2e76a210a96b7f62a
2020-03-24 11:13:41 +00:00
Ben Murdoch
7c7b42d06d
Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 63aded6f67 am: cdcf827947
...
Change-Id: I5e74700e6ce21ffc21ee1b13200c5741bf476de7
2020-03-24 11:13:08 +00:00
Ben Murdoch
3e74710b10
Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 7b2154d996 am: ffc010f55e
...
Change-Id: I0665a3cdc28361591859a73748361002fa45d0b5
2020-03-24 11:13:03 +00:00
Automerger Merge Worker
1c4765f6ee
Merge "Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 7b2154d996" into rvc-d1-dev-plus-aosp
2020-03-24 10:57:38 +00:00
Ben Murdoch
55ee7603e5
Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 7b2154d996
...
Change-Id: I199ea1ad09f5aaef63ffc9312d058a5c452e53d5
2020-03-24 10:57:28 +00:00
Ben Murdoch
ffc010f55e
Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 7b2154d996
...
Change-Id: I08d7d6d5d17356c1903a814c68e572a7851657e0
2020-03-24 10:57:24 +00:00
Ben Murdoch
cdcf827947
Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 63aded6f67
...
Change-Id: I6fec6b405557e9ad69ff875e890591be9a6d8d02
2020-03-24 10:57:24 +00:00
Ben Murdoch
7b2154d996
Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599
...
Change-Id: I4a67e3a9d94d63f0cc9cb6942acabd1e9c32b936
2020-03-24 10:45:49 +00:00
Ben Murdoch
63aded6f67
Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599
...
Change-Id: I822c63ede7d0f92dbfe724731350fc140db88ef5
2020-03-24 10:45:25 +00:00
Ben Murdoch
7afced3599
Merge "Move strings related to user creation to SettingsLib." into rvc-dev
2020-03-24 10:25:21 +00:00
Zoey Chen
c961f3d239
[automerger skipped] Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: 2a0dd6f700 am: 12952db603 am: 775ae6b0fd -s ours
...
am skip reason: Change-Id I6b363bd609d580d547cb59851f5bfaba57ef7154 with SHA-1 2b8bde162f
2020-03-24 10:04:29 +00:00
Zoey Chen
7e6f34a300
[automerger skipped] Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: c1f1682fbf -s ours am: 03e57ffd43 -s ours
...
am skip reason: Change-Id I6b363bd609d580d547cb59851f5bfaba57ef7154 with SHA-1 2b8bde162f
2020-03-24 09:56:18 +00:00
Zoey Chen
775ae6b0fd
Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: 2a0dd6f700 am: 12952db603
...
Change-Id: Ia58afd40f773cb257267263639c1911d4e1fd086
2020-03-24 09:55:50 +00:00
