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
Kweku Adams
ffba9c7c40
Merge "Using explicit Looper in Handler initialization." into qt-dev am: bb1d4e7f1e
...
am: 6b91eb3047
2019-04-23 15:21:54 -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
Hyunyoung Song
1a0a4c1bb0
Merge "Reduce binder call to OverlayManager (3->1)" into qt-dev am: 5f328aff51
...
am: e85166328c
2019-04-23 15:10:06 -07:00
Arc Wang
9680a5892b
Merge "Add action metrics for Wi-Fi provision features" into qt-dev am: 79f75e483f
...
am: a23f01673b
2019-04-23 14:49:05 -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
Beverly
3af410c9fa
Merge "Remove "unless turned on automatically" text" into qt-dev am: 87158ed0b2
...
am: cab31cf14c
2019-04-23 14:23:35 -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
Kweku Adams
6b91eb3047
Merge "Using explicit Looper in Handler initialization." into qt-dev
...
am: bb1d4e7f1e
2019-04-23 12:24:50 -07:00
Andrew Sapperstein
b2ad73da8e
Merge "Fix WifiDetailPreferenceControllerTest new test case failure" into qt-dev
...
am: 28cfb72aaa
2019-04-23 12:19:11 -07:00
Hyunyoung Song
e85166328c
Merge "Reduce binder call to OverlayManager (3->1)" into qt-dev
...
am: 5f328aff51
2019-04-23 12:12:12 -07:00
Arc Wang
a23f01673b
Merge "Add action metrics for Wi-Fi provision features" into qt-dev
...
am: 79f75e483f
2019-04-23 11:57:02 -07:00
TreeHugger Robot
bb1d4e7f1e
Merge "Using explicit Looper in Handler initialization." into qt-dev
2019-04-23 18:28:56 +00:00
Andrew Sapperstein
28cfb72aaa
Merge "Fix WifiDetailPreferenceControllerTest new test case failure" into qt-dev
2019-04-23 18:18:41 +00:00
Beverly
cab31cf14c
Merge "Remove "unless turned on automatically" text" into qt-dev
...
am: 87158ed0b2
2019-04-23 11:13:50 -07: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
TreeHugger Robot
5f328aff51
Merge "Reduce binder call to OverlayManager (3->1)" into qt-dev
2019-04-23 17:50:05 +00:00
TreeHugger Robot
79f75e483f
Merge "Add action metrics for Wi-Fi provision features" into qt-dev
2019-04-23 17:36:54 +00:00
TreeHugger Robot
87158ed0b2
Merge "Remove "unless turned on automatically" text" into qt-dev
2019-04-23 17:02:28 +00: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
Beverly
6315dc41d1
Remove "unless turned on automatically" text
...
- In Q, the title of this preference was changed from
"Duration" to "Default duration." The title change clarifies
that the preference controls the dnd default duration and not the
schedules, so we can now remove "unless turned on automatically"
text in the subtext.
Test: manual
Fixes: 130843902
Change-Id: I404acd61136e1e1aa4675e421c07ce871c1f9db9
2019-04-23 10:08:32 -04: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
21903c6c9b
Merge "Expand advanced button by default in Notifications." into qt-dev am: ab2b8c5bfa
...
am: ccc73b4ced
2019-04-23 02:51:18 -07:00
Yi-Ling Chuang
ccc73b4ced
Merge "Expand advanced button by default in Notifications." into qt-dev
...
am: ab2b8c5bfa
2019-04-23 02:43:17 -07:00
TreeHugger Robot
ab2b8c5bfa
Merge "Expand advanced button by default in Notifications." into qt-dev
2019-04-23 09:33:47 +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
Arc Wang
104acaf3d4
Merge "Change description string of Wi-Fi add device" into qt-dev am: dd310fa892
...
am: e7f2326b63
2019-04-22 21:51:15 -07:00
Arc Wang
e7f2326b63
Merge "Change description string of Wi-Fi add device" into qt-dev
...
am: dd310fa892
2019-04-22 21:47:19 -07:00
TreeHugger Robot
dd310fa892
Merge "Change description string of Wi-Fi add device" into qt-dev
2019-04-23 04:32:26 +00: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
Alex Salo
e1fa6524b9
Merge "Remove todo comment" into qt-dev am: 37db031aa1
...
am: 7bb8466d96
2019-04-22 18:47:19 -07:00
cosmohsieh
46bf431734
Merge "Improve some comments of strings and codes" into qt-dev am: 0bc3fac6d9
...
am: b7fc587b5b
2019-04-22 18:29:44 -07:00
Kevin Chyn
7353282194
Merge "Update enrollment footer icon" into qt-dev am: c9239e11b6
...
am: 012ba13cb3
2019-04-22 18:28:47 -07:00
Kevin Chyn
c627c01433
Merge "Update introduction layout spacing" into qt-dev am: 89f0d5274a
...
am: 38d44c96a0
2019-04-22 18:27:19 -07: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
Alex Salo
7bb8466d96
Merge "Remove todo comment" into qt-dev
...
am: 37db031aa1
2019-04-22 18:20:57 -07:00
Fan Zhang
2df01c1ae9
Merge "Partial revert Ib2396575bbc69a7cca5e9c90e113c76ff6db00b5" into qt-dev am: 5e42b894bc
...
am: d1bc5895b0
2019-04-22 18:11:43 -07:00
cosmohsieh
b7fc587b5b
Merge "Improve some comments of strings and codes" into qt-dev
...
am: 0bc3fac6d9
2019-04-22 18:01:09 -07:00
Kevin Chyn
012ba13cb3
Merge "Update enrollment footer icon" into qt-dev
...
am: c9239e11b6
2019-04-22 18:00:13 -07:00
Kevin Chyn
38d44c96a0
Merge "Update introduction layout spacing" into qt-dev
...
am: 89f0d5274a
2019-04-22 17:55:21 -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
d1bc5895b0
Merge "Partial revert Ib2396575bbc69a7cca5e9c90e113c76ff6db00b5" into qt-dev
...
am: 5e42b894bc
2019-04-22 17:32:32 -07:00
TreeHugger Robot
37db031aa1
Merge "Remove todo comment" into qt-dev
2019-04-23 00:19:26 +00:00
