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
SongFerng Wang
00f2672399
Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c
am: e8604065d6
am: 3d28629f5e
am: 869883bcd8
...
Change-Id: I774908569013ae9c0f5d4a620dbe09258b9fa05e
2020-03-25 05:15:17 +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
SongFerng Wang
3d28629f5e
Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c
am: e8604065d6
...
Change-Id: I2bb4ec5e524099f1d3fccf53e55dcca27d1e0ad6
2020-03-25 04:50:42 +00:00
Bonian Chen
f9bb3b4d05
Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev
2020-03-25 04:35:04 +00:00
SongFerng Wang
d33b66304c
Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev
2020-03-25 04:16:18 +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
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
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
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
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
TreeHugger Robot
d18f4d248a
Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01
am: 875b0df3dd
am: 8247c93340
am: a76db9ae4c
...
Change-Id: I57140ea1858a0b35d7c1f04031947eb99bbdc8a0
2020-03-24 13:23:22 +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
87c0179c01
Merge "Re-enable ignored tests" into rvc-dev
2020-03-24 12:22:11 +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
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
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
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
TreeHugger Robot
9b9b83f3cd
Merge "Redesign individual conversation page" into rvc-dev am: 43d9013aaa
am: 7866eddfa5
am: fea8da24ee
am: bc35ad85b8
...
Change-Id: I141a416ad6c63161c8049193def2c2385a66d2bb
2020-03-23 17:45:45 +00:00
TreeHugger Robot
fea8da24ee
Merge "Redesign individual conversation page" into rvc-dev am: 43d9013aaa
am: 7866eddfa5
...
Change-Id: I515f324a16bab7590f0a863e9a04448ab5f1e536
2020-03-23 17:05:16 +00:00
TreeHugger Robot
38fab2476f
Merge "Redesign individual conversation page" into rvc-dev am: 43d9013aaa
...
Change-Id: Ie994ae2bed19579385b5aa49f9303fc3778ea16a
2020-03-23 16:46:04 +00:00
TreeHugger Robot
43d9013aaa
Merge "Redesign individual conversation page" into rvc-dev
2020-03-23 16:31:27 +00:00
TreeHugger Robot
236330ac81
Merge "Updates main page for Do Not Disturb" into rvc-dev am: 4d4c55ad72
am: fae0dc47f8
...
Change-Id: I9a5e16d435a3455ac30d54ccdafb430bd388f4d7
2020-03-23 14:49:22 +00:00
TreeHugger Robot
6f1ebe6d79
Merge "Updates main page for Do Not Disturb" into rvc-dev am: 4d4c55ad72
...
Change-Id: I40f114a95b899c28f41ca1f899f0760297eb7953
2020-03-23 14:21:30 +00:00
TreeHugger Robot
4d4c55ad72
Merge "Updates main page for Do Not Disturb" into rvc-dev
2020-03-23 14:01:46 +00:00
Raff Tsai
f7ade29151
Merge "Modify close app function." am: ce1f51128b
am: 579878afcf
am: ffe91b44f8
am: cf990c239e
am: 8543472a19
...
Change-Id: Idc543fb7f23f46391fbb54a681f8bac62178cd7a
2020-03-23 11:52:11 +00:00
Raff Tsai
ffe91b44f8
Merge "Modify close app function." am: ce1f51128b
am: 579878afcf
...
Change-Id: I27fd2f9dbb6e852d53d02ef638d3a49abb32ac12
2020-03-23 11:09:22 +00:00
Raff Tsai
579878afcf
Merge "Modify close app function." am: ce1f51128b
...
Change-Id: I80e83ae16c2a2f931604e864fb79ee1d02db6a0e
2020-03-23 10:53:44 +00:00
Fiona Campbell
56df409d78
Merge "Fix displayed brightness value in settings." into rvc-dev am: 9a712271f2
am: 9eae2b7531
am: 87f9d9aff7
am: 7f434778a3
...
Change-Id: I0a671c288791bbd5a6521e4fdffcfb6af4a47724
2020-03-23 10:05:50 +00:00
Fiona Campbell
87f9d9aff7
Merge "Fix displayed brightness value in settings." into rvc-dev am: 9a712271f2
am: 9eae2b7531
...
Change-Id: I3b876975c5b706b181ff2ab56f41a0b03a45a17d
2020-03-23 09:29:43 +00:00
youtengliang
aa4f582931
Modify close app function.
...
Test: atest com.android.settings.tests.perf
Change-Id: Ia504dd1185de1d33a21fec344871d4b0fabae953
2020-03-23 09:29:28 +00:00
Fiona Campbell
a165e13de0
Merge "Fix displayed brightness value in settings." into rvc-dev am: 9a712271f2
...
Change-Id: Ia2626e63c27344c591b8a54b8cec8bf0973e020e
2020-03-23 09:04:51 +00:00
Fiona Campbell
9a712271f2
Merge "Fix displayed brightness value in settings." into rvc-dev
2020-03-23 08:54:26 +00:00
Arc Wang
fafcd3b362
[Wi-Fi] Fix ignored tests in WifiDetailPreferenceController2Test - II
...
Some tests are removed because WifiTracerLib listens to most intents
and callbacks to Settings APP, most of the receiving intent tests are
removed.
Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test
Change-Id: Ie726938b7c6e94bbaf6479f6a8797a92d869ba8c
2020-03-23 16:21:07 +08:00
Bonian Chen
7c4b785a83
Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172
am: 3ebf728910
am: caaae4627e
am: 928ddce1f0
...
Change-Id: Ie611255390be747ee6282a310f2f9924a7361d0d
2020-03-23 07:15:54 +00:00
Bonian Chen
caaae4627e
Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172
am: 3ebf728910
...
Change-Id: I659ecc4aae14fcb0bbba8af558c65adabb566bed
2020-03-23 06:54:36 +00:00
Bonian Chen
3ca9e69e2b
Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev am: 31315e4172
...
Change-Id: I13bdb4cb0a9cf1cc8b7f9930a50a016d208acae3
2020-03-23 06:36:27 +00:00
Bonian Chen
31315e4172
Merge "[Settings] Apply ImsQueryController#isServiceStateReady to VoLte" into rvc-dev
2020-03-23 06:20:42 +00:00