Fan Zhang
142dc4e3f7
Merge "Fix a NPE when removing accounts." into qt-dev am: 0014cd721e
...
am: 67c8031f08
2019-04-23 21:54:29 -07:00
lindatseng
5c47099259
Merge "Fix robotests in settings/panel" into qt-dev am: 3225026ed6
...
am: 55c4916fb7
2019-04-23 19:59:42 -07:00
Amin Shaikh
55169adcd5
Merge "Add overlayable_icons_test.xml for Settings." into qt-dev am: cd52cf18ce
...
am: e6f875f267
2019-04-23 19:48:14 -07:00
Fan Zhang
67c8031f08
Merge "Fix a NPE when removing accounts." into qt-dev
...
am: 0014cd721e
2019-04-23 19:03:19 -07:00
Fan Zhang
3e8626b6dc
Merge "Test case clean up." into qt-dev am: c6bc40d397
...
am: 8243f6ae44
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
2019-04-23 17:21:47 -07:00
lindatseng
55c4916fb7
Merge "Fix robotests in settings/panel" into qt-dev
...
am: 3225026ed6
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
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
2019-04-23 15:49:38 -07:00
Fan Zhang
8243f6ae44
Merge "Test case clean up." into qt-dev
...
am: c6bc40d397
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
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
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
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
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
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
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
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
