Antony Sargent
74cc69fb2e
Merge "Always show disabled pSIMs in single-sim mode" into qt-dev am: cd07aa1cc4
...
am: 4d9ff1e113
2019-04-23 17:07:43 -07:00
Andrew Sapperstein
7aa1566584
Merge "Fix WifiDetailPreferenceControllerTest new test case failure" into qt-dev am: 28cfb72aaa
...
am: b2ad73da8e
2019-04-23 15:13:36 -07:00
Antony Sargent
4d9ff1e113
Merge "Always show disabled pSIMs in single-sim mode" into qt-dev
...
am: cd07aa1cc4
2019-04-23 14:28:57 -07:00
TreeHugger Robot
cd07aa1cc4
Merge "Always show disabled pSIMs in single-sim mode" into qt-dev
2019-04-23 21:06:47 +00:00
Andrew Sapperstein
b2ad73da8e
Merge "Fix WifiDetailPreferenceControllerTest new test case failure" into qt-dev
...
am: 28cfb72aaa
2019-04-23 12:19:11 -07:00
Andrew Sapperstein
28cfb72aaa
Merge "Fix WifiDetailPreferenceControllerTest new test case failure" into qt-dev
2019-04-23 18:18:41 +00:00
Antony Sargent
bdd9eb3ba7
Always show disabled pSIMs in single-sim mode
...
In single-sim mode, you can have both an eSIM subscription and a pSIM
inserted into the device, and only one of them can be enabled. It turns
out that if the pSIM is the disabled one, we would not show it in the
settings UI; this CL fixes that.
It also fixes a somewhat related problem that I noticed while testing
this, that if you have only one subscription that happens to be
disabled, we were not showing the on/off switch at the top of the page,
which would leave you with no way to enable it.
Bug: 129864878
Test: make RunSettingsRoboTests
Change-Id: I4214ad34c59ac2df429772c066c51a9318f5baa7
2019-04-23 10:55:51 -07:00
Jason Chiu
a8feaee8e0
Merge "Automatically direct the user to the captive portal in Wi-Fi Slice" into qt-dev am: 805e208f14
...
am: 86d8a9ce8d
2019-04-23 09:30:01 -07:00
Jason Chiu
86d8a9ce8d
Merge "Automatically direct the user to the captive portal in Wi-Fi Slice" into qt-dev
...
am: 805e208f14
2019-04-23 09:13:56 -07:00
TreeHugger Robot
805e208f14
Merge "Automatically direct the user to the captive portal in Wi-Fi Slice" into qt-dev
2019-04-23 11:47:21 +00:00
clownshen
b87e5455bc
Fix WifiDetailPreferenceControllerTest new test case failure
...
Bug: 130370187
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Change-Id: I314702be14db4e853412874c123e0a4b229849a2
2019-04-23 17:15:32 +08:00
Jason Chiu
a73d7715d1
Automatically direct the user to the captive portal in Wi-Fi Slice
...
Save the SSID when the user clicks the network, and then automatically
start login page when the network gets the captive portal capability.
Fixes: 128056349
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: Ia25241a8243d7d6aae604f341b512350404d9fd1
2019-04-23 12:07:20 +08:00
Clown SHEN
156bafe634
Merge "Fix WifiDetailPreferenceControllerTest failure" into qt-dev am: 2a14b7e8b5
...
am: 1575a3fa40
2019-04-22 20:51:10 -07:00
Clown SHEN
50234a6d6f
Merge "Correct detail page UI once user change MAC randomized setting" into qt-dev am: 2e340d284e
...
am: e0dbee7894
2019-04-22 20:35:56 -07:00
Clown SHEN
1575a3fa40
Merge "Fix WifiDetailPreferenceControllerTest failure" into qt-dev
...
am: 2a14b7e8b5
2019-04-22 20:15:35 -07:00
Clown SHEN
e0dbee7894
Merge "Correct detail page UI once user change MAC randomized setting" into qt-dev
...
am: 2e340d284e
2019-04-22 20:13:24 -07:00
Clown SHEN
2a14b7e8b5
Merge "Fix WifiDetailPreferenceControllerTest failure" into qt-dev
2019-04-23 03:02:31 +00:00
Clown SHEN
2e340d284e
Merge "Correct detail page UI once user change MAC randomized setting" into qt-dev
2019-04-23 03:01:48 +00:00
Lei Yu
0015b827c5
Merge "Test fix: Add MmsPreferenceController to whitelist" into qt-dev am: 357825d228
...
am: 787e15fbe5
2019-04-22 18:22:36 -07:00
Lei Yu
787e15fbe5
Merge "Test fix: Add MmsPreferenceController to whitelist" into qt-dev
...
am: 357825d228
2019-04-22 17:50:40 -07:00
Fan Zhang
c25fe8d6d1
Merge "Fix CodeInspectionTest" into qt-dev am: 4b54ad9bd5
...
am: d9fb048712
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
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
2019-04-22 11:35:04 -07:00
Lei Yu
7ec9c1db1d
Merge "Add mms preference and controller" into qt-dev
...
am: f3365e911d
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
2019-04-22 10:23:26 -07:00
Tim Peng
568520bdf5
Remove "Play media to" when no connected device
...
am: 99ed023ca4
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
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
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
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
2019-04-19 21:07:49 -07:00
Mark Chien
7b30503dc4
Merge "Ignore the outdated entitlement check"
...
am: d7885ca73a
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
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
2019-04-19 18:07:31 -07:00
Fan Zhang
1b1bfc6508
Merge "Fix typo" into qt-dev am: 33f136fdec
...
am: cd576bfaae
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
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
2019-04-19 18:04:49 -07:00
Lei Yu
87bdcd3ce2
Merge "Fix battery robo test" into qt-dev
...
am: fc48118694
2019-04-19 17:20:53 -07:00
