Commit Graph

60275 Commits

Author SHA1 Message Date
Bonian Chen
c8cb51a422 Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05 am: 0f4345cdf6 am: 243d1a61b7
Change-Id: I54bd6dbc2c85aaf6f7edac03cde57e9d160f1659
2020-03-25 04:59:46 +00:00
SongFerng Wang
f90f7cf31b Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c am: e8604065d6 am: f30fa1c861
Change-Id: Id223e18fbe00e4eb1f35c379929620dd30b9abbb
2020-03-25 04:59:37 +00:00
Bonian Chen
243d1a61b7 Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05 am: 0f4345cdf6
Change-Id: Ic5c58238e13d1b235125c34badaccdf7196930f8
2020-03-25 04:51:36 +00:00
SongFerng Wang
f30fa1c861 Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c am: e8604065d6
Change-Id: Ia7332d609bd40646005985fd296876d4f44a3c1e
2020-03-25 04:51:26 +00:00
Bonian Chen
0f4345cdf6 Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05
Change-Id: I82b04e8dadd3559c7d12d6bba1df7cd2e968c89b
2020-03-25 04:41:24 +00:00
Bonian Chen
f9bb3b4d05 Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev 2020-03-25 04:35:04 +00:00
SongFerng Wang
e8604065d6 Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c
Change-Id: Icc2051fe3015fbd5913689be03f3a2f4a1baef58
2020-03-25 04:33:50 +00:00
SongFerng Wang
d33b66304c Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev 2020-03-25 04:16:18 +00:00
Jason Chiu
336dc70ee8 Merge "Move sticky cards to the bottom" into rvc-dev am: bff181f846 am: dd5ee8b808 am: 8c0e3d930f
Change-Id: I6c085977a466a24260a93b99230ff355f2f7c285
2020-03-25 03:12:12 +00:00
Jason Chiu
8c0e3d930f Merge "Move sticky cards to the bottom" into rvc-dev am: bff181f846 am: dd5ee8b808
Change-Id: I817413b15da63ab99bef8fc5655a3060f28ed09d
2020-03-25 02:59:11 +00:00
Jason Chiu
dd5ee8b808 Merge "Move sticky cards to the bottom" into rvc-dev am: bff181f846
Change-Id: I5d527a528f71fe5077251832d1f44e29be8604af
2020-03-25 02:42:40 +00:00
Jason Chiu
bff181f846 Merge "Move sticky cards to the bottom" into rvc-dev 2020-03-25 02:28:07 +00:00
Jason Chiu
4e6841e7b5 Move sticky cards to the bottom
Sticky cards have higher scores and were on the top of homepage.

Bug: 149274976
Test: visual
Change-Id: I5fc2303ac42fff5bc4d44e355112ea4529253acd
2020-03-25 02:27:43 +00:00
Bonian Chen
806c9d5214 [Settings] Code refactor on MobileNetworkActivity
Apply the behavior of ProxySubscriptionManager into
MobileNetworkActivity.

Bug: 149190278
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkActivityTest
Change-Id: I2d4b12dead7a9ea68cc8e335cd37f22226fe295f
2020-03-25 10:19:40 +08:00
TreeHugger Robot
16e1ff4802 Merge "Fix Passpoint network details privacy and ssid" into rvc-dev am: 56fb482acf am: cc07420ed7 am: 8606696674
Change-Id: I960f1f96fb1d482472052d3b72e34e4d6f142503
2020-03-25 01:47:47 +00:00
TreeHugger Robot
8606696674 Merge "Fix Passpoint network details privacy and ssid" into rvc-dev am: 56fb482acf am: cc07420ed7
Change-Id: Ic9b1c02f4f1ae07108e1ac5aa25a5e97b2e7c0b1
2020-03-25 01:36:05 +00:00
TreeHugger Robot
cc07420ed7 Merge "Fix Passpoint network details privacy and ssid" into rvc-dev am: 56fb482acf
Change-Id: Ib9d44deb3bad3086dc8ea1e7b81cc3027b2236c9
2020-03-25 01:22:52 +00:00
TreeHugger Robot
56fb482acf Merge "Fix Passpoint network details privacy and ssid" into rvc-dev 2020-03-25 01:04:47 +00:00
Philip P. Moltmann
954e45fc00 Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e am: 64d9d6eb15 am: e2774bdaab
Change-Id: I01d383b8eb03df787a359eebb814ca3531bd780b
2020-03-25 00:21:54 +00:00
TreeHugger Robot
51e405d39c Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: 558095e583 am: d6b3dae0a6
Change-Id: I3481d092a29c9270d5c941ec1205cee631e7ef5f
2020-03-25 00:21:36 +00:00
Philip P. Moltmann
e2774bdaab Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e am: 64d9d6eb15
Change-Id: I78726af3d1eeba7a083149d3233d6eba3649fce5
2020-03-25 00:08:20 +00:00
TreeHugger Robot
d6b3dae0a6 Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: 558095e583
Change-Id: Ia8fdd87b57d002382abf5be635d30ec40eee4895
2020-03-25 00:07:58 +00:00
Philip P. Moltmann
64d9d6eb15 Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e
Change-Id: I978b101a36a251d9428dd2d17711d30511c6f2b9
2020-03-25 00:01:04 +00:00
Philip P. Moltmann
7443e3de6e Merge "Send attributionTag to notification APIs" into rvc-dev 2020-03-24 23:53:51 +00:00
TreeHugger Robot
558095e583 Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8
Change-Id: I4a4e9d0ef55b07cee0207e73dba1b577d8aa1bc9
2020-03-24 23:48:40 +00:00
TreeHugger Robot
d227755be8 Merge "[Settings] Avoid from Settings crash" into rvc-dev 2020-03-24 23:32:34 +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
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
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
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
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
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
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
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
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
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
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
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
7afced3599 Merge "Move strings related to user creation to SettingsLib." into rvc-dev 2020-03-24 10:25:21 +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
Zoey Chen
12952db603 Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: 2a0dd6f700
Change-Id: I3a69d760a434d24130fad2abf4a5150a31087970
2020-03-24 09:33:31 +00:00
SongFerngWang
a043c5a7ad Fix the NetworkScanHelperTest testcase.
To fix the NetworkScanHelperTest testcase, becasue mainline cause
the testcase fail.

Bug: 147464840
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkScanHelperTest
Change-Id: I2992606dd082d2b87e047beacd9cf1c26790f450
2020-03-24 17:16:51 +08:00
Zoey Chen
2a0dd6f700 Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9
Change-Id: I75a262c21d215f8669c81056b581c5ffd734accb
2020-03-24 09:16:28 +00:00