Commit Graph

37846 Commits

Author SHA1 Message Date
Joe Bolinger
0b705abada Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178

Change-Id: I2cebeaef5456520f8d4a40fa20c6c8f469007218
2021-08-07 00:21:37 +00:00
Joe Bolinger
336d3e5501 Merge "Fix extra password confirm prompts during managed setup." into sc-dev 2021-08-07 00:07:22 +00:00
Bonian Chen
a5517006b3 Merge "[Settings] eSIM existance detection rule change" into sc-dev am: 68ac2d69c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15453991

Change-Id: Idb67e48147c633e60c317876abdb19c48fcb90cf
2021-08-06 03:31:26 +00:00
Bonian Chen
68ac2d69c0 Merge "[Settings] eSIM existance detection rule change" into sc-dev 2021-08-06 03:15:49 +00:00
Beverly Tai
6adbe74b92 Merge "Use pattern subtitle string on all enroll stages" into sc-dev am: 60773b9a37
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15473086

Change-Id: Ic4dd5daa7ec14ebd94d54ac789a9d93c6ff7b556
2021-08-05 21:50:27 +00:00
Beverly Tai
60773b9a37 Merge "Use pattern subtitle string on all enroll stages" into sc-dev 2021-08-05 21:28:22 +00:00
Joe Bolinger
c11e01f39d Fix extra password confirm prompts during managed setup.
Managed accounts may set the pin/pattern before enrollment begins.

Fix: 191608999
Test: atest BiometricEnrollActivityTest
Change-Id: I4065989ecc26ce72ffd0e06e7c6e68029a11908f
2021-08-05 11:08:48 -07:00
Beverly
c9a609eb6d Use pattern subtitle string on all enroll stages
So the views won't relayout and cause the pattern
to render in a strange way.

Test: manual
Bug: 194368020
Change-Id: If6fd7ade4fd6783fe5d1ef78acc847928e01bd29
2021-08-05 17:17:30 +00:00
Bonian Chen
35df60f316 [Settings] eSIM existance detection rule change
1. eSIM retrieved from SubscriptionManager#getAvailableSubscriptionInfoList()
should be considered as existed all the time.

2. When SIM are both inactive(or active), sorted the ordering based on ordering provided by telephony framework.

Bug: 195090132
Bug: 195091953
Bug: 194197762
Test: local
Change-Id: I2fe43a35e5b7965bde3b579e2297e9cdd89ec228
(cherry picked from commit 848d097b94)
(cherry picked from commit 824deb0ee3727f23ab68a75176825c4c73f482a9)
2021-08-05 06:31:35 +00:00
Peter Wang
e098b85711 Merge "Update broadcast intent string to correct format" into sc-dev am: 831d1153e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15406091

Change-Id: I2f8fdf57c5bf00ffd68861daaf2701ac0c1196c0
2021-08-04 18:06:10 +00:00
Peter Wang
831d1153e9 Merge "Update broadcast intent string to correct format" into sc-dev 2021-08-04 17:54:03 +00:00
TreeHugger Robot
f42a8893c6 Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev am: 6f1bc2f52e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258816

Change-Id: I0daddb467799ae48f25a1ecbf2e9b76081f96f1b
2021-08-04 07:28:12 +00:00
TreeHugger Robot
6f1bc2f52e Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev 2021-08-04 07:16:35 +00:00
Yifan Hong
bbd851fea7 Merge "PairDevice to structured Parcelable." am: f7ff663887 am: eddbc8a356
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780667

Change-Id: Ife1bbb4e839ee6115b2809113c715068cdb94e59
2021-08-04 00:07:38 +00:00
Yifan Hong
d61750990d PairDevice to structured Parcelable.
Bug: 194829333
Test: pass
Change-Id: I202ae5aa16d4323afa2a48cc3070f8e13c701efd
2021-08-03 14:05:31 -07:00
Joe Bolinger
8a8f607218 Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev am: fdb80de825
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15433652

Change-Id: I7912e8ac26ee4c5cd611a8d7e535fb3f4f93d018
2021-08-02 21:26:51 +00:00
Joe Bolinger
fdb80de825 Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev 2021-08-02 21:15:40 +00:00
Hugh Chen
a3a0661d1b Fix "USB tethering" will auto turn on then off when turn off "USB tethering"
This CL only updates the "USB tethering preference" when
onTetheredInterfacesChanged() is invoked to avoid the
"USB tethering preference" being changed when received
non-tethering change intent.

Bug: 185590309
Test: make -j42 RunSettingsRoboTests
Change-Id: Ifed9f5c7edef670eeb21baf3841999382ee10ff2
2021-08-02 10:34:56 +08:00
Joe Bolinger
d5ea0ffe67 Skip enrollment when unicorn account is launched by setup wizard.
Bug: 194244555
Test: manual
Change-Id: Id310c5e4dec1b1c5262c9703259223ce21b1da61
2021-07-30 12:51:02 -07:00
TreeHugger Robot
bc39d7f73e Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15388307

Change-Id: Ic9337fe64ae71afa60bbe6d8e3ef4a2a511b6cd9
2021-07-30 08:30:58 +00:00
TreeHugger Robot
74060d3158 Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev 2021-07-30 08:18:01 +00:00
Treehugger Robot
9cfd6a6164 Merge "Fix memory leak in TopLevelBatteryPreferenceController" am: 060bf953e3 am: f5876a1df9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606501

Change-Id: I9966577fec0160fb4c13cde9cfcf7bf8d7b5697d
2021-07-30 02:45:06 +00:00
Joe Bolinger
21ef1830ea Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev am: 12e161d1dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413152

Change-Id: I4c5dd9f9a73e7bc83d8e5c0ccf90358f8bdc8383
2021-07-30 01:35:07 +00:00
Joe Bolinger
12e161d1dc Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev 2021-07-30 01:21:55 +00:00
Joe Bolinger
91d7545826 Limit biometric enrollments when Unicorn account is present.
This prevents biometric enrollment from happening after consent
has been obtained and is being managed by family link.

Note that this requires a corresponding change the setup wizard app
to work in most cases.

Bug: 193577587
Test: manual (enroll then relaunch SuW and repeat)
Change-Id: If260e49f38a141931d7f3362c1faf80ee7790232
2021-07-29 15:43:04 -07:00
Evan Severson
1ea7d23088 Merge "Set toggle state for profile group" into sc-dev am: 405fac1ca0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15362614

Change-Id: I23b162a2acae20a9621e84ba3953c12ebbe57e41
2021-07-29 20:00:10 +00:00
Evan Severson
405fac1ca0 Merge "Set toggle state for profile group" into sc-dev 2021-07-29 19:45:59 +00:00
Anita Hemrajani
6187ec83a8 Fix memory leak in TopLevelBatteryPreferenceController
Assigning context.getApplicationContext() as context in
ConditionContextualCardController.

Bug: 181192885
Test: run connectivity module auo test pass

Change-Id: Iff35520f911a9fd62a0bbb5bbda20608e9d99246
2021-07-29 15:30:28 +08:00
SongFerngWang
9d9d06ab24 Fix the wrong comparison am: 1bcba3d23f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15403429

Change-Id: If39ce68a76790912d69dfce084bbf8b9421f8ec0
2021-07-28 17:03:56 +00:00
SongFerngWang
1bcba3d23f Fix the wrong comparison
Bug: 173387374
Test: atest NetworkSelectSettingsTest (PASS)
test on real device (PASS)

Change-Id: Ib1135b0457b4e35db67e671cad142657457d6d75
2021-07-28 14:15:31 +00:00
Bonian Chen
3f0dc952ac [Settings] Allow disabled SIM to be controlled in UI
Disabled SIM are hidden from UI due to the API only check if there's a
SIM with mobile data capability active within device.

Right now, the UI design has been changed. The UI here should be
accessible no mater with or without the support of mobile data.

Bug: 193820245
Bug: 194761536
Test: local
Change-Id: I9c8b8fa16e74cd0fe4419966cc97ad55b5b87b17
(cherry picked from commit 847f326cd4)
(cherry picked from commit a8ce9abde7)
2021-07-28 11:58:23 +08:00
Zoey Chen
046c8d4a97 Merge "[BackupCall] The toggle doesn't work when try to disable/enable it." into sc-dev am: 1a6982f195
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372352

Change-Id: I6e15a328c230cae09f8a980cf86cb9f09a577655
2021-07-28 03:40:11 +00:00
Zoey Chen
1a6982f195 Merge "[BackupCall] The toggle doesn't work when try to disable/enable it." into sc-dev 2021-07-28 03:21:12 +00:00
Zoey Chen
9894f347f2 [BackupCall] The toggle doesn't work when try to disable/enable it.
Bug: 192060713
Test: atest NetworkProviderBackupCallingGroupTest
Change-Id: I250c321d682f77e95967824ec033dd3c1ea64b65
2021-07-28 09:11:05 +08:00
Peter Wang
039b99acd9 Update broadcast intent string to correct format
Bug: 179949381
Test: Build
Change-Id: If6f97c8c5b73c8b00cf448763dee84940d026379
2021-07-27 17:15:26 -07:00
Joe Bolinger
1841f0f132 Merge "Use RestrictedPreference for all biometric settings." into sc-dev am: 7e9077fd14
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15394293

Change-Id: I2c400fb7daffee7abf6e1df4a3636e593b13586e
2021-07-27 17:41:42 +00:00
Joe Bolinger
61d998406d Use RestrictedPreference for all biometric settings.
Fix hardcoded preference key in settings controller.

Fix: 194708564
Bug: 194246380
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I86bdd40fd848c5ba2d39acfde4771f5969e640d1
2021-07-26 18:36:32 -07:00
Peter Kalauskas
3f3c7b7762 Merge "Fix: change owner name when account setup" into sc-dev am: c9076d3d36
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15377999

Change-Id: I6084b5f8ec7e7a07afede1594d3a302974165c74
2021-07-26 15:07:10 +00:00
Peter Kalauskas
c9076d3d36 Merge "Fix: change owner name when account setup" into sc-dev 2021-07-26 14:52:29 +00:00
TreeHugger Robot
7364b38193 Merge "Use correct user ID for face bypass pref controller" into sc-dev am: ae23247270
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379629

Change-Id: I3979eea6816ff8f6cf37f698b6015f87b4b0d4e9
2021-07-24 18:58:49 +00:00
TreeHugger Robot
ae23247270 Merge "Use correct user ID for face bypass pref controller" into sc-dev 2021-07-24 18:46:18 +00:00
Curtis Belmonte
43f2be2059 Use correct user ID for face bypass pref controller
Ensures that the lockscreen bypass preference toggle shown on the face
unlock settings screen always uses the correct user ID. This fixes an
issue where the preference toggle for a guest user would use the
primary user's setting when multiple biometrics are supported.

Test: Manual:
1. Turn on Settings > System > Multiple users > Use multiple users
2. Add a guest account and switch to it
3. Enroll a face for Face Unlock on the guest account
4. From the Face Unlock settings screen, toggle "Skip lock screen"
5. Ensure that face bypasses lock screen iff this toggle is on
6. Switch back to the owner account and repeat steps 3-5

Fixes: 193488905
Change-Id: I2da4ce466fe0446cccc9119c90bd322daf627339
2021-07-24 09:20:08 -07:00
Tom Hsu
10af4a87fb Merge "[Settings] Fix problem that MobileNetworkActivity show wrong Info." into sc-dev am: d3d3161695
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372364

Change-Id: Ie33f9ae9cb7dfe13562b67010a8b56cf8941a288
2021-07-24 06:41:01 +00:00
tom hsu
01f43ff290 [Settings] Fix problem that MobileNetworkActivity show wrong Info.
- UiccSlotInfo only provide current active slots. It doesn't provide
 inactive slot. Thus,it should not use it for checking sim existed.

Bug: 194022251
Bug: 194378040
Test: Maunal test
Change-Id: I00a3fcf3f700bee804bad12039d6d13a1404cc74
2021-07-24 05:34:07 +00:00
Adam Bookatz
7ae8801fba Fix: change owner name when account setup
When the device is setup with an account the
owner's user name should be updated. This was broken due to
ag/14056085, so we fix it here.

Test: manual (set up new device and make sure name is changed)
Bug: 194510551
Change-Id: Ide5bc525eba17c78f457c2baa131d7cefd4c15dd
2021-07-23 23:50:54 +00:00
Evan Severson
7d1835a319 Set toggle state for profile group
The toggle state should be set for all users in the current profile
group; for example a profile user.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=SensorToggleControllerTest
Fixes: 194280328
Change-Id: Ib0b74e7b27722b44b116e614dc960bff72983a38
2021-07-23 16:04:39 +00:00
SongFerng Wang
9b1493a789 Merge "aggregate the items of network selection list" into sc-dev am: 9e6928ae2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15340173

Change-Id: I4769f0bcb21bf6b56f8dad38f535472b85437ebe
2021-07-23 09:18:40 +00:00
SongFerng Wang
9e6928ae2e Merge "aggregate the items of network selection list" into sc-dev 2021-07-23 09:04:58 +00:00
ykhung
4b5be3b73a Remove some debugging log to avoid print too much data out am: 13bcdba67a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15360451

Change-Id: I0c8e6985c083dd8e9c9958efb796eb0abaf09a4e
2021-07-23 08:50:56 +00:00
SongFerngWang
7f5c984655 aggregate the items of network selection list
According to bug comment#44, modem only report one PLMN per RAT
for different cells reported for the same PLMN/RAT combination,
UI affregate those items.
Bug: 173387374
Test: atest NetworkSelectSettingsTest

Change-Id: I155abc8dda7c8ec42cf4fd677bd2aa99d1033ad1
Merged-In: I8e05b9f6784bad7f0de4e79cc6e707749745f0c1
2021-07-23 07:27:30 +00:00