Commit Graph

30986 Commits

Author SHA1 Message Date
Vince Leung
f93c47c0a0 Merge "Use super method for Vibration preferences" 2020-03-25 06:29:15 +00:00
Menghan Li
81204e8f28 Merge "Enlarge the touch area of edit shortcut dialog" into rvc-dev am: f9f732e3be am: f84c49f13a am: cc7f9e781f am: ee6b74de12
Change-Id: I1d6e78f6e8f6dec8681f73a4ac8ebf49a2b67944
2020-03-25 06:22:13 +00:00
Menghan Li
cc7f9e781f Merge "Enlarge the touch area of edit shortcut dialog" into rvc-dev am: f9f732e3be am: f84c49f13a
Change-Id: I831ad7fedeb62267949f5685839f42f68cc0090d
2020-03-25 05:47:59 +00:00
Menghan Li
f9f732e3be Merge "Enlarge the touch area of edit shortcut dialog" into rvc-dev 2020-03-25 05:23:44 +00:00
Bonian Chen
e1c699c7af Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05 am: 0f4345cdf6 am: ff7dc60895 am: 8f9c9e6402
Change-Id: I29886624ce72c8cb3ca6c297ccb7ff1d63e435c2
2020-03-25 05:15:23 +00:00
Bonian Chen
ff7dc60895 Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05 am: 0f4345cdf6
Change-Id: Ibce5efebb8c0fd20471811f7cd5ce324a5b347c1
2020-03-25 04:51:01 +00:00
Bonian Chen
f9bb3b4d05 Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev 2020-03-25 04:35:04 +00:00
Jason Chiu
84f86702eb Merge "Move sticky cards to the bottom" into rvc-dev am: bff181f846 am: 8c4d31c8c4 am: 6839ead7c6 am: 11a6cbd998
Change-Id: I12c636fb6cb9bf698465ca5aa167918478029ec1
2020-03-25 03:27:20 +00:00
menghanli
bd09e28a84 Enlarge the touch area of edit shortcut dialog
Bug: 148837311
Test: Manual test
Change-Id: I54ca93ccaa87514bf4d201b95ed855003d1c164c
2020-03-25 11:20:32 +08: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
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
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
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
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
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
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
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
aaa0cc5238 Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd am: 941d437df6 am: cff74feef2 am: 03c0421dc4
Change-Id: I23c953ca75db72ecbbe754d59a83cdb9b6e90441
2020-03-24 22:00:27 +00:00
Julia Reynolds
e23b91a9b3 Merge "Notification history updates" into rvc-dev am: 8d3741fbca am: 31f9705a60 am: 7cad4c67df am: 465b7a2c95
Change-Id: I39da1000218400d1c1253f5f42e88ba981fb8d04
2020-03-24 21:59:32 +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
941d437df6 Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd
Change-Id: I065eb16003c13ed562242e1d9d2eb5deb6870415
2020-03-24 21:42:44 +00:00
Julia Reynolds
79fd5811cd Merge "Update all conversations screen" into rvc-dev 2020-03-24 21:33:53 +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
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
Ben Murdoch
16398e5564 Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 63aded6f67 am: cdcf827947 am: 7c7b42d06d
Change-Id: I03fb1a0f60fac8c8ce9260331894b947bf0cd371
2020-03-24 11:28:22 +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
61b66a28d9 Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev 2020-03-24 09:05:00 +00:00
Arc Wang
766e874428 Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766 am: e446e42d63 am: 660cacfa0d am: 787f8a7635
Change-Id: I394d039cd49428709ce3405d4461bc4c71c7b3b5
2020-03-24 08:28:45 +00:00
Bonian Chen
77f2788f82 Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600 am: 0a5211a6d5 am: aec1582388 am: 2a25cd5c22
Change-Id: I3bd85778b588901160779683cb19b5c34c970d21
2020-03-24 08:12:52 +00:00
Arc Wang
e446e42d63 Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766
Change-Id: Ic73404a2c3392f1049786b5601a72316086eb900
2020-03-24 07:46:26 +00:00
Arc Wang
e4b0989766 Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev
* changes:
  [Wi-Fi] Fix ignored tests in WifiDetailPreferenceController2Test - II
  [Wi-Fi] Fix ignored tests in WifiDetailPreferenceController2Test - I
2020-03-24 07:25:17 +00:00
Bonian Chen
0a5211a6d5 Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600
Change-Id: I42831f5540acd25bc6129ca14ad42b1717cf9e98
2020-03-24 07:15:24 +00:00
Bonian Chen
9a0f633600 Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev 2020-03-24 07:03:52 +00:00
TreeHugger Robot
55fa8229a7 Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: c21f849fe7 am: f5eac3f0cf am: 95d85c0e34
Change-Id: I7335593a093a8e25c0296434e710f7ccd667d140
2020-03-24 06:52:32 +00:00
TreeHugger Robot
f5eac3f0cf Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: c21f849fe7
Change-Id: I2795824b08a4c7943ebb8e19ecbb2cd8cc3cdfa8
2020-03-24 06:31:21 +00:00
Treehugger Robot
2b8bde162f Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0
Bug: 150258187
Change-Id: I6b363bd609d580d547cb59851f5bfaba57ef7154
(cherry picked from commit 7c62cbd97e)
Merged-In: I6b363bd609d580d547cb59851f5bfaba57ef7154
2020-03-24 06:21:25 +00:00
TreeHugger Robot
437b0b66d4 Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048
Change-Id: I15d091a2b9354b2f6039abc5d7f8d26befde577a
2020-03-24 06:09:06 +00:00
TreeHugger Robot
a33c8e8048 Merge "Update DND people Settings pages" into rvc-dev 2020-03-24 05:56:29 +00:00
Quang Luong
40c4303fb3 Fix Passpoint network details privacy and ssid
Allow changing the privacy setting for Passpoint networks, which are
considered subscriptions but not saved networks. Also use getSsid() for
the SSID pref.

Bug: 70983952
Test: manual build and visual verification
Change-Id: I8a4309421b28bccaf2bd62a23dca8cef133d5af1
2020-03-23 21:11:41 -07:00
Bonian Chen
073f483d86 [Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API
Replace SubscriptionManager#addOnSubscriptionsChangedListener API in
order to compatible with legacy design.

Bug: 151838951
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=SubscriptionsChangeListenerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=ActiveSubsciptionsListenerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=SimStatusDialogControllerTest
Change-Id: Ib98ce0dcbf18b6f48a6f267dd9e7be017d571157
2020-03-24 11:51:23 +08:00