Commit Graph

63072 Commits

Author SHA1 Message Date
Jason Chiu
6839ead7c6 Merge "Move sticky cards to the bottom" into rvc-dev am: bff181f846 am: 8c4d31c8c4
Change-Id: If17eb07bc5080c69e395afe2ba60f5ad3e3dbeab
2020-03-25 02:59: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
8c4d31c8c4 Merge "Move sticky cards to the bottom" into rvc-dev am: bff181f846
Change-Id: I08aa3c6b3650480b6c631365a0eae049cc2a073f
2020-03-25 02:43:06 +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
af7932120b Merge "Fix Passpoint network details privacy and ssid" into rvc-dev am: 56fb482acf am: cc07420ed7 am: 8606696674 am: 16e1ff4802 am: c062fa0111
Change-Id: If3d18d37610902682b8b69564de5230065a3171b
2020-03-25 02:05:09 +00:00
Automerger Merge Worker
b527cd64f6 Merge "Merge "Fix Passpoint network details privacy and ssid" into rvc-dev am: 56fb482acf am: cc07420ed7" into rvc-d1-dev-plus-aosp am: 0c443e813e am: 50675e4f24
Change-Id: Iac3847dde304bd44b6fc2758e91dcbaedbeea36e
2020-03-25 02:04:51 +00:00
TreeHugger Robot
b33d60d868 Merge "Fix Passpoint network details privacy and ssid" into rvc-dev am: 56fb482acf am: 395d0fb2b4 am: 2e65c42842 am: ca0f8a39f3
Change-Id: Ibfdd761415f506f511c4f33202f94a20e0f64406
2020-03-25 02:04:09 +00:00
TreeHugger Robot
c062fa0111 Merge "Fix Passpoint network details privacy and ssid" into rvc-dev am: 56fb482acf am: cc07420ed7 am: 8606696674 am: 16e1ff4802
Change-Id: Ic73596fbce66ed9c3d148b40dacc33cd7a3b3cd4
2020-03-25 02:04:03 +00:00
Automerger Merge Worker
50675e4f24 Merge "Merge "Fix Passpoint network details privacy and ssid" into rvc-dev am: 56fb482acf am: cc07420ed7" into rvc-d1-dev-plus-aosp am: 0c443e813e
Change-Id: I162c24f4de1b18fb4eff005015fc5f02920f911e
2020-03-25 01:48:18 +00:00
TreeHugger Robot
ca0f8a39f3 Merge "Fix Passpoint network details privacy and ssid" into rvc-dev am: 56fb482acf am: 395d0fb2b4 am: 2e65c42842
Change-Id: I12b49df6afebf7e4c73070ffc78fa2fe1ef2debe
2020-03-25 01:47:55 +00: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
Automerger Merge Worker
0c443e813e Merge "Merge "Fix Passpoint network details privacy and ssid" into rvc-dev am: 56fb482acf am: cc07420ed7" into rvc-d1-dev-plus-aosp 2020-03-25 01:36:00 +00:00
TreeHugger Robot
ff195ef339 Merge "Fix Passpoint network details privacy and ssid" into rvc-dev am: 56fb482acf am: cc07420ed7
Change-Id: I5048f8459d7d3c3e997fb491f8fe921a31fd87fd
2020-03-25 01:35:53 +00:00
TreeHugger Robot
2e65c42842 Merge "Fix Passpoint network details privacy and ssid" into rvc-dev am: 56fb482acf am: 395d0fb2b4
Change-Id: I9961e431f5bc8dbb508a17be463b81df11f1ab68
2020-03-25 01:35:50 +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
395d0fb2b4 Merge "Fix Passpoint network details privacy and ssid" into rvc-dev am: 56fb482acf
Change-Id: I341c49c78d234cfbf536431b282b234d06069eda
2020-03-25 01:22:41 +00:00
TreeHugger Robot
56fb482acf Merge "Fix Passpoint network details privacy and ssid" into rvc-dev 2020-03-25 01:04:47 +00:00
Rahul Sabnis
5bce75f0fb Verify BluetoothDevice is not null before calling BluetoothHearingAid
System APIs

Bug: 149238489
Test: Manual
Change-Id: Ic6de2ccd81dc66ce79afcd91f18e92e959c8b12b
2020-03-24 18:03:13 -07:00
Philip P. Moltmann
429c4417db Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e am: 64d9d6eb15 am: e2774bdaab am: 954e45fc00 am: be73ba7af7
Change-Id: I4c1206ea8509be038bf2b8ef0fa3d69e11dd3890
2020-03-25 00:56:02 +00:00
TreeHugger Robot
634ec2523b Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: 558095e583 am: d6b3dae0a6 am: 51e405d39c am: 735d8d80cb
Change-Id: I38c09c8ecfb35f334b4b033397a0add4cc5ddfa2
2020-03-25 00:44:37 +00:00
Philip P. Moltmann
51e38187a8 Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e am: 64d9d6eb15 am: e59daf3ef3 am: 06470d595e
Change-Id: I540ba04371129b5db16bebb49bbe77f1626e3172
2020-03-25 00:42:14 +00:00
Philip P. Moltmann
125d06a311 Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e am: 74be567166 am: 6f8310ec88 am: 8a6b846051
Change-Id: I120903751c891abe36f32b55dc04ebaa2f8db8bb
2020-03-25 00:40:47 +00:00
Automerger Merge Worker
0b32437916 Merge "Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: 558095e583" into rvc-d1-dev-plus-aosp am: 4ee8a227a1 am: 53d73451b3
Change-Id: I5d2715b0223a344e8c076fca93d7893bf7eaa4f8
2020-03-25 00:40:35 +00:00
TreeHugger Robot
715687986f Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: d169749e7d am: adce5a2ec1 am: e7a6a2c302
Change-Id: Ic1b13d094291cf06644533f59b5195183904b5a4
2020-03-25 00:37:49 +00:00
Philip P. Moltmann
be73ba7af7 Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e am: 64d9d6eb15 am: e2774bdaab am: 954e45fc00
Change-Id: Ibb2b201cf0e4786cf29992d2444e6cbf82195d21
2020-03-25 00:37:03 +00:00
TreeHugger Robot
735d8d80cb Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: 558095e583 am: d6b3dae0a6 am: 51e405d39c
Change-Id: I483fbed6e30062f35bfb35d5d9d842f8815faf26
2020-03-25 00:36:45 +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
Philip P. Moltmann
06470d595e Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e am: 64d9d6eb15 am: e59daf3ef3
Change-Id: I7b8ee43cd8ef4c633174d42040523fb21db20869
2020-03-25 00:21:42 +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
8a6b846051 Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e am: 74be567166 am: 6f8310ec88
Change-Id: Iedb585d9cea2e8563bfb256c09ca5c4c77e420b4
2020-03-25 00:21:34 +00:00
Automerger Merge Worker
53d73451b3 Merge "Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: 558095e583" into rvc-d1-dev-plus-aosp am: 4ee8a227a1
Change-Id: Ib735fb26fc1370a6c03774c4ffd4f3f952e61876
2020-03-25 00:21:29 +00:00
TreeHugger Robot
e7a6a2c302 Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: d169749e7d am: adce5a2ec1
Change-Id: I0ec4049b249fa122ed4d7b7bcdc3180c10e006c1
2020-03-25 00:21:03 +00:00
Philip P. Moltmann
e59daf3ef3 Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e am: 64d9d6eb15
Change-Id: Id581c03843fdad4d3c083ffa59cd4b7e5e732582
2020-03-25 00:08: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
Philip P. Moltmann
6f8310ec88 Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e am: 74be567166
Change-Id: I53cef5fcbde7e24b00f94831350357050ce01103
2020-03-25 00:08:20 +00:00
Automerger Merge Worker
4ee8a227a1 Merge "Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: 558095e583" into rvc-d1-dev-plus-aosp 2020-03-25 00:08:10 +00:00
TreeHugger Robot
a3848257dd Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: 558095e583
Change-Id: I641d1a2119f6e4748515774d57d0a2f1cfa01be5
2020-03-25 00:07:59 +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
TreeHugger Robot
adce5a2ec1 Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: d169749e7d
Change-Id: I2478aacd60522ad19983c023d37965bc2cb71116
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
74be567166 Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e
Change-Id: I1c30cfefbcdaa08e715b17b262e42a9c7448b3b8
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
d169749e7d Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8
Change-Id: I2fb1ee5ab5f737660676b27062b89329e9cedf81
2020-03-24 23:47:44 +00:00
TreeHugger Robot
d227755be8 Merge "[Settings] Avoid from Settings crash" into rvc-dev 2020-03-24 23:32:34 +00:00
Julia Reynolds
2829bfbc5c Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd am: b5d726003f am: 46b8b3b4d2 am: a9b755c116 am: 08d8254ae0
Change-Id: I652e51a3919c89186ca87d6db8e0a6d6c75d23ae
2020-03-24 22:29:53 +00:00