Commit Graph

9138 Commits

Author SHA1 Message Date
Fan Zhang
3e8626b6dc Merge "Test case clean up." into qt-dev am: c6bc40d397
am: 8243f6ae44

Change-Id: I70978d1fe98c7e4b04c068d5d0f376d9a8be84aa
2019-04-23 18:53:41 -07:00
TreeHugger Robot
0014cd721e Merge "Fix a NPE when removing accounts." into qt-dev 2019-04-24 01:22:49 +00:00
Fan Zhang
f489fb9bd1 Merge "Force the adapter to rebind cards with a toggle." into qt-dev am: 141984df7f
am: ab12ffbbb3

Change-Id: Ifda9379665a641a046f0c9b70430acf2d636f261
2019-04-23 17:21:47 -07:00
lindatseng
55c4916fb7 Merge "Fix robotests in settings/panel" into qt-dev
am: 3225026ed6

Change-Id: I9e34dfd5420266fe43b119a352f0e93dc29b2993
2019-04-23 17:15:00 -07:00
Antony Sargent
74cc69fb2e Merge "Always show disabled pSIMs in single-sim mode" into qt-dev am: cd07aa1cc4
am: 4d9ff1e113

Change-Id: I7b0a4bd4d0ac01c17998784bbf8ff49e025a28a6
2019-04-23 17:07:43 -07:00
TreeHugger Robot
3225026ed6 Merge "Fix robotests in settings/panel" into qt-dev 2019-04-23 23:44:31 +00:00
Amin Shaikh
e6f875f267 Merge "Add overlayable_icons_test.xml for Settings." into qt-dev
am: cd52cf18ce

Change-Id: I3f926f0d02076e2c97b15a4e438d3bcb1b305f3c
2019-04-23 15:49:38 -07:00
Fan Zhang
8243f6ae44 Merge "Test case clean up." into qt-dev
am: c6bc40d397

Change-Id: I20ebfd2bddc7d93305f4075343d27bcf0c5ecc41
2019-04-23 15:48:20 -07:00
Fan Zhang
ab12ffbbb3 Merge "Force the adapter to rebind cards with a toggle." into qt-dev
am: 141984df7f

Change-Id: I74eac95f91152760ca6abed6eff729e6eec0e933
2019-04-23 15:46:30 -07:00
TreeHugger Robot
cd52cf18ce Merge "Add overlayable_icons_test.xml for Settings." into qt-dev 2019-04-23 22:39:55 +00:00
Fan Zhang
c6bc40d397 Merge "Test case clean up." into qt-dev 2019-04-23 22:34:46 +00:00
Fan Zhang
141984df7f Merge "Force the adapter to rebind cards with a toggle." into qt-dev 2019-04-23 22:33:16 +00:00
Fan Zhang
e3ecf5bb9e Fix a NPE when removing accounts.
Guard against null activity. If activity is already null, there is no
need to call finish().

Fixes: 131180213
Test: robotests
Change-Id: I19232ed67ddd0c3539b1827de23fdc584850b519
2019-04-23 15:23:36 -07:00
Andrew Sapperstein
7aa1566584 Merge "Fix WifiDetailPreferenceControllerTest new test case failure" into qt-dev am: 28cfb72aaa
am: b2ad73da8e

Change-Id: I2d267d88965d3db10849ece1a920f27f75687590
2019-04-23 15:13:36 -07:00
lindatseng
f19f7981df Fix robotests in settings/panel
Remove @Ignore for tests in settings/panel after testing.
Also update VolumePanelTest according to the recent changes to
remote volume slice.

Test: atest PanelFragmentTest
Test: atest SettingsPanelActivityTest
Test: VolumePanelTest
Fixes: 130896218
Change-Id: Iaa99e65d959cafd382d7209664f2fdbf660c29e0
2019-04-23 15:03:34 -07:00
Antony Sargent
4d9ff1e113 Merge "Always show disabled pSIMs in single-sim mode" into qt-dev
am: cd07aa1cc4

Change-Id: I830e9604d1005f354d10ff5cb30c911243284e42
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

Change-Id: I5543b540f1b61a4c0f844f11886e45d56959162d
2019-04-23 12:19:11 -07:00
Amin Shaikh
1a5317c34d Add overlayable_icons_test.xml for Settings.
This ensures that developers do not accidentally delete/rename overlayed
icons without updating overlayable_icons_test.xml and renaming overlayed assets.

Bug: 128571899
Test: make RunSettingsRoboTests
Change-Id: I991883a7d480fbae848106ab24033a16d1405300
2019-04-23 15:04:02 -04: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

Change-Id: I449770b897407afae739ae5e9e852a694512f70f
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

Change-Id: I733b0eb6cfded17baa0f1fb1e329618fb16547c3
2019-04-23 09:13:56 -07:00
pastychang
ec0a30a8b9 Set QR scan activity to light theme in setup flow
Test: atest
Bug: 131029518
Change-Id: Ibec28e78fcf17390cd3844ead4a88a4e6bff6094
2019-04-23 13:38:39 +00:00
Yi-Ling Chuang
80dd452e89 Test case clean up.
Move some test cases from ContextualCardLoader to
EligibleCardChecker.

Fixes: 131147203
Test: robotests
Change-Id: Ia6508962d7b878c5f89b8d350c791a44cadb9d36
2019-04-23 20:41:50 +08: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
Yi-Ling Chuang
acb50f2c6a Force the adapter to rebind cards with a toggle.
A card dismissal and scheduled card collection trigger a reload. During
card reloading, we perform slices pre check. The pre check goes through
the whole slice binding process, which means slices will be pinned and unpinned.
Hence, the on screen slices will gets unpinned resulting to the
unresponsive toggling.

As we have DiffCallbck implmented, if the card list are the same, then
bindView in the renderer will be ignored, which means the unpinned slice
will have no chance to re-register slice callback. So here we force it
to rebind the views.

Fixes: 123174237
Test: robotests
Change-Id: Id98bc16632bf024cbb611b40890e4d2629f08d7b
2019-04-23 17:19:56 +08: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

Change-Id: I254ae60a4fac0f68e83ab5d8bbb4fa2a929ff6c4
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

Change-Id: I0f499ed7e65cc4cc1b8736694577493c5e535caf
2019-04-22 20:35:56 -07:00
Clown SHEN
1575a3fa40 Merge "Fix WifiDetailPreferenceControllerTest failure" into qt-dev
am: 2a14b7e8b5

Change-Id: If34484a29f3338bb594e47e65ae9f4c9049cfd7e
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

Change-Id: I65852f7e05b31db4633a27d007c3bc5e0f0326f6
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

Change-Id: I4530a2d6e26a082332b776351464633232d28e9b
2019-04-22 18:22:36 -07:00
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