Commit Graph

8702 Commits

Author SHA1 Message Date
Lei Yu
787e15fbe5 Merge "Test fix: Add MmsPreferenceController to whitelist" into qt-dev
am: 357825d228

Change-Id: I5e64d99af01a568f2f98fbda0240ca09e85fc65c
2019-04-22 17:50:40 -07:00
Fan Zhang
c25fe8d6d1 Merge "Fix CodeInspectionTest" into qt-dev am: 4b54ad9bd5
am: d9fb048712

Change-Id: Ie7e99df8d2a2721120178886763db00b4c4adbc5
2019-04-22 16:02:46 -07:00
Lei Yu
41ad7a5bb4 Test fix: Add MmsPreferenceController to whitelist
Add it to grandfather_slice_controller_not_in_xml since right now
it only exists in mobile_network_settings_v2.xml, not v1.

This should be fixed automatically once we remove all old code.

Bug: 130222866
Test: RunSettingsRoboTests
Change-Id: Ib0bc976fd31818d7b39ca9f3e7427859fd7175ff
2019-04-22 15:55:16 -07:00
Fan Zhang
d9fb048712 Merge "Fix CodeInspectionTest" into qt-dev
am: 4b54ad9bd5

Change-Id: I9f5885c5c9e52019ea9142337b18722e903a459c
2019-04-22 15:14:51 -07:00
TreeHugger Robot
4b54ad9bd5 Merge "Fix CodeInspectionTest" into qt-dev 2019-04-22 21:37:29 +00:00
Lei Yu
cc8f78bf30 Merge "Add mms preference and controller" into qt-dev am: f3365e911d
am: 7ec9c1db1d

Change-Id: I6a18373e1567d332a8a6a74c8449fc9ec9d28698
2019-04-22 11:35:04 -07:00
Lei Yu
7ec9c1db1d Merge "Add mms preference and controller" into qt-dev
am: f3365e911d

Change-Id: I7d564e576a0ce387f376e71af54839794a3281cd
2019-04-22 11:14:34 -07:00
Lei Yu
f3365e911d Merge "Add mms preference and controller" into qt-dev 2019-04-22 17:55:34 +00:00
Tim Peng
8f130628fa Remove "Play media to" when no connected device am: 99ed023ca4
am: 568520bdf5

Change-Id: If5de94fba3f751e29155df223372ce6a165120df
2019-04-22 10:23:26 -07:00
Tim Peng
568520bdf5 Remove "Play media to" when no connected device
am: 99ed023ca4

Change-Id: I462ce390a7addc95ceacb0f0a4e48382ac34aed5
2019-04-22 10:03:39 -07:00
clownshen
922b555dfb Fix WifiDetailPreferenceControllerTest failure
Bug: 130896210
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Change-Id: I994fbc4a67f4c58afebb38316555f8e1442b96c0
2019-04-22 18:33:46 +08:00
Tim Peng
99ed023ca4 Remove "Play media to" when no connected device
Bug: 130251782
Test: make -j42 RunSettingsRoboTests
Change-Id: Id40199a67aef48b99f59cf6e04f93be2abe5e8fc
2019-04-22 06:09:36 +00:00
clownshen
60013de198 Correct detail page UI once user change MAC randomized setting
Changing MAC randomized setting will disconnect and reconnect Wi-Fi in
the background automatically. UI display as disconnect even AP
reconnected. Fix this problem and also remove some obsolete code.
Another problem is connect button display as disabled with
"Connecting..." wording after user click connect then change the MAC
randomized setting.

Bug: 130370187
Test: Manual test with test case in go/wifi_connnection_btn_design
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Change-Id: Id87c3db0cc785a9ceb3a71c7cbb78ffd87ffb0a1
2019-04-22 11:44:37 +08:00
TreeHugger Robot
f263f489e2 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-04-21 04:43:31 +00:00
TreeHugger Robot
4428eb0624 Merge "Import translations. DO NOT MERGE" 2019-04-21 02:42:38 +00:00
Bill Yi
80d2278070 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I681232854213f3b89d0543d30c640622d759a396
2019-04-20 17:58:18 -07:00
Bill Yi
7cd3661791 Import translations. DO NOT MERGE
Change-Id: I90c45c06f57d03b07411318467c38abc0b725c55
Auto-generated-cl: translation import
2019-04-20 17:15:08 -07:00
Jonathan Scott
1f8154690f Merge "Remove redundant (and failing) test getAvailabilityStatus_hasManagedUser_AVAILABLE" into qt-dev am: 5a8cf48813
am: 28a697103d

Change-Id: Id394e1495f49fdca0353a7d9111ecf2273bf7ab1
2019-04-20 16:29:55 -07:00
Jonathan Scott
28a697103d Merge "Remove redundant (and failing) test getAvailabilityStatus_hasManagedUser_AVAILABLE" into qt-dev
am: 5a8cf48813

Change-Id: Icea3822382cd2d6c21cedeb1560c4ed2f316d316
2019-04-20 16:24:57 -07:00
TreeHugger Robot
5a8cf48813 Merge "Remove redundant (and failing) test getAvailabilityStatus_hasManagedUser_AVAILABLE" into qt-dev 2019-04-20 23:16:25 +00:00
Mark Chien
57659716d0 Merge "Ignore the outdated entitlement check" am: d7885ca73a am: 7b30503dc4
am: f886be6999

Change-Id: Ic2cd5ed57ec675d0ad13521cc354a1eb4cc38d69
2019-04-19 23:45:35 -07:00
Mark Chien
77b7618138 Merge "Ignore the outdated entitlement check" into qt-dev 2019-04-20 04:41:52 +00:00
Mark Chien
f886be6999 Merge "Ignore the outdated entitlement check" am: d7885ca73a
am: 7b30503dc4

Change-Id: I294f9f2e9ca239cb8f1c689580ce266ddead8f5b
2019-04-19 21:07:49 -07:00
Mark Chien
7b30503dc4 Merge "Ignore the outdated entitlement check"
am: d7885ca73a

Change-Id: If610c3233137562571eeff0b2d73b2bdd946ebd9
2019-04-19 20:26:15 -07:00
Mark Chien
d7885ca73a Merge "Ignore the outdated entitlement check" 2019-04-20 02:05:33 +00:00
Lei Yu
88ba448b3a Merge "Fix battery robo test" into qt-dev am: fc48118694
am: 87bdcd3ce2

Change-Id: I06ff2450d1757a4ae45a28866084f7bb377c8a30
2019-04-19 18:56:31 -07:00
Salvador Martinez
f0ecd2bf7d Merge "Update battery stuff to use SettingsLib Estimate class" into qt-dev am: 022af8ca10
am: 72d99dd38c

Change-Id: I2b9279b3f11abef1719c6d23fa998774aa983af8
2019-04-19 18:07:31 -07:00
Fan Zhang
1b1bfc6508 Merge "Fix typo" into qt-dev am: 33f136fdec
am: cd576bfaae

Change-Id: I97b8d4fb843805b97317b94c85865497aac1543e
2019-04-19 18:06:38 -07:00
Fan Zhang
812db12067 Merge "Add a way to suppress injected tiles for OEMs" into qt-dev am: ac76a480bd
am: 4a4b2a5b00

Change-Id: I9873cb57e2bc2fd7584527d39215b80a2381161b
2019-04-19 18:05:50 -07:00
Fan Zhang
85e4de5122 Merge "Add @Ignore for all failing tests." into qt-dev am: 1830440231
am: 5a0629d12f

Change-Id: I9d7e1906b3e5b0b213d5d3d4e1e90ca1acf4f4a9
2019-04-19 18:04:49 -07:00
Lei Yu
87bdcd3ce2 Merge "Fix battery robo test" into qt-dev
am: fc48118694

Change-Id: Id0bcad14d216bb2718435dffdb802e105af440d4
2019-04-19 17:20:53 -07:00
TreeHugger Robot
fc48118694 Merge "Fix battery robo test" into qt-dev 2019-04-19 23:13:51 +00:00
Salvador Martinez
72d99dd38c Merge "Update battery stuff to use SettingsLib Estimate class" into qt-dev
am: 022af8ca10

Change-Id: Ie0e16d985ef878e9989ad4037947ff57e34749fc
2019-04-19 15:56:21 -07:00
Lei Yu
5fbde81391 Merge "Add SettingsPolicy to control BT feature" into qt-dev am: 125ab50a55
am: 142ca23949

Change-Id: I7f9b2c921651ba9e6163fb7ecc22db370a52196d
2019-04-19 15:55:15 -07:00
Fan Zhang
cd576bfaae Merge "Fix typo" into qt-dev
am: 33f136fdec

Change-Id: If6ba4153c8f642643054e1f7e949d4111a6e3b7e
2019-04-19 15:54:48 -07:00
Fan Zhang
4a4b2a5b00 Merge "Add a way to suppress injected tiles for OEMs" into qt-dev
am: ac76a480bd

Change-Id: I5d72983c4c9cda2a6cfb36fb5931dfdff00ac45f
2019-04-19 15:53:26 -07:00
Fan Zhang
5a0629d12f Merge "Add @Ignore for all failing tests." into qt-dev
am: 1830440231

Change-Id: Ic779b72c3bf3a06e32c7dbe11f87e654baf70664
2019-04-19 15:21:59 -07:00
Salvador Martinez
022af8ca10 Merge "Update battery stuff to use SettingsLib Estimate class" into qt-dev 2019-04-19 22:00:27 +00:00
Jonathan Scott
4316259aa0 Remove redundant (and failing) test getAvailabilityStatus_hasManagedUser_AVAILABLE
This is already covered by
getAvailabilityStatus_somePackagesAllowed_shouldBeAvailable and
getAvailabilityStatus_allPackagesAllowed_shouldBeAvailable.

Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=CrossProfileCalendarPreferenceControllerTest
Fixes: 130896049
Change-Id: I3dbbbde693750c69e042f7c19143730cc8e313ff
2019-04-19 22:19:21 +01:00
Fan Zhang
5c9db0cb5e Fix CodeInspectionTest
Fixes: 130897640
Test: robo
Change-Id: Ic2d952e4d76bb0a2be6eab7ddc999b56656132a6
2019-04-19 14:14:51 -07:00
Lei Yu
2632f45010 Fix battery robo test
Fixes: 130896701
Test: RunSettingsRoboTests
Change-Id: Iffb7874250335db81181b23f96fe7b50a2dd0062
2019-04-19 13:41:22 -07:00
Fan Zhang
33f136fdec Merge "Fix typo" into qt-dev 2019-04-19 20:32:37 +00:00
Fan Zhang
5d705839f2 Fix typo
Bug: 130897882
Test: rebuild
Change-Id: I066b69634214cd25c4acbd173e8fe82cd73d4e97
2019-04-19 13:31:52 -07:00
Fan Zhang
ac76a480bd Merge "Add a way to suppress injected tiles for OEMs" into qt-dev 2019-04-19 20:30:24 +00:00
Fan Zhang
1830440231 Merge "Add @Ignore for all failing tests." into qt-dev 2019-04-19 20:28:47 +00:00
Fan Zhang
ef2e91913b Add @Ignore for all failing tests.
Bug: 130896210
Bug: 130896218
Bug: 130896701
Bug: 130897882
Bug: 130897305
Bug: 130897640
Bug: 130896049
Test: robo
Change-Id: I77143d504501b358c2103aa736cd2aad13ed4c5c
2019-04-19 13:23:29 -07:00
Lei Yu
142ca23949 Merge "Add SettingsPolicy to control BT feature" into qt-dev
am: 125ab50a55

Change-Id: I46f37c9a1ac92bd3e77e2a2f8ff185a72436851e
2019-04-19 13:18:15 -07:00
Lei Yu
125ab50a55 Merge "Add SettingsPolicy to control BT feature" into qt-dev 2019-04-19 19:44:53 +00:00
Lei Yu
5d85dfb123 Add mms preference and controller
Only visible when it is metered and mobile data off.
Also refactor one mobile data observer so we can reuse it.

Bug: 130222866
Test: RunSettingsRoboTests
Change-Id: Id218f51da3c373fad98c1a39cfadd6b0e8c46a88
2019-04-19 11:25:14 -07:00
Linda Tseng
7e8d682188 Merge "Set max num of slices allowed in panel view" into qt-dev am: ae344faf4a
am: 67928018b3

Change-Id: Idbab620c65b8dbd65b721caca3e669f89baeed36
2019-04-19 11:07:16 -07:00