Joe Bolinger
a69d97a6e6
Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev am: 12e161d1dc
am: 769447a502
am: 24a3796f7c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413152
Change-Id: I189313c9eaf6d05fa5b06872f1b8c51056094255
2021-07-30 02:04:28 +00:00
Joe Bolinger
24a3796f7c
Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev am: 12e161d1dc
am: 769447a502
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413152
Change-Id: I264232763f7e0af216291368ae5f704942f12ad7
2021-07-30 01:50:19 +00:00
Joe Bolinger
0e4f451cc1
Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev am: 12e161d1dc
am: cd50557c3f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413152
Change-Id: Idb9a72ae857be801a8f74fe75da0d2d91b09c171
2021-07-30 01:49:56 +00:00
Joe Bolinger
769447a502
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: If88427e1b7ed4d5227c821ab65e47f52cc9c5481
2021-07-30 01:36:43 +00:00
Joe Bolinger
cd50557c3f
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: If4c0396b8b89dae066a9c44f4adc31f14139e7a7
2021-07-30 01:36:02 +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
7edd7040bc
Merge "Set toggle state for profile group" into sc-dev am: 405fac1ca0
am: 1ea7d23088
am: 14b7870359
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15362614
Change-Id: I33e11cecd5fd2cc05e91b2655d4213ddd0071d12
2021-07-29 20:28:16 +00:00
Evan Severson
0e5b24df9b
Merge "Set toggle state for profile group" into sc-dev am: 405fac1ca0
am: 8a1461a212
am: e2b8e585b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15362614
Change-Id: I15281c3e8de1b46f05461173c3a0381d0fa03c1b
2021-07-29 20:28:05 +00:00
Evan Severson
14b7870359
Merge "Set toggle state for profile group" into sc-dev am: 405fac1ca0
am: 1ea7d23088
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15362614
Change-Id: Ic9d017314e117b01c6b89d551c35ec6c334ab26e
2021-07-29 20:16:03 +00:00
Evan Severson
e2b8e585b1
Merge "Set toggle state for profile group" into sc-dev am: 405fac1ca0
am: 8a1461a212
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15362614
Change-Id: Id015925230ad1cea4063edc0cb197b54bbf2950c
2021-07-29 20:15:42 +00:00
Evan Severson
422705ab6f
Merge "Set toggle state for profile group" into sc-dev am: 405fac1ca0
am: 4f253570f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15362614
Change-Id: I6f832b9d5e67acd4351a6bf045f57b8b370637e1
2021-07-29 20:15:17 +00:00
Evan Severson
8a1461a212
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: I02ba1737c89d0f85012586ead62b0835f67d2397
2021-07-29 20:01:45 +00:00
Evan Severson
4f253570f8
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: I49aff7021bff62248bb48e4be01f522c60fcec44
2021-07-29 20:01:04 +00: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
TreeHugger Robot
5f5414477a
Merge "Update the "Location services" header to be sentence case" into sc-dev am: 68d15388f4
am: 14073ffdbb
am: 61ef2b16a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15404706
Change-Id: Ib93e354a928fd3fea1c343f87698329390d00db3
2021-07-29 15:48:00 +00:00
TreeHugger Robot
b74fa1d339
Merge "Update the "Location services" header to be sentence case" into sc-dev am: 68d15388f4
am: 84286f0ea1
am: 09b7117716
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15404706
Change-Id: I45ef50bf0691bfcce5fa6ac1b4bd5d73442c9c53
2021-07-29 15:47:40 +00:00
TreeHugger Robot
61ef2b16a0
Merge "Update the "Location services" header to be sentence case" into sc-dev am: 68d15388f4
am: 14073ffdbb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15404706
Change-Id: Ib90d8b40b6f9171d7a17ca4f2dddc72485777859
2021-07-29 15:34:23 +00:00
TreeHugger Robot
09b7117716
Merge "Update the "Location services" header to be sentence case" into sc-dev am: 68d15388f4
am: 84286f0ea1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15404706
Change-Id: I4642b4900ff44d764cfe7cd3474c7b08524e26fb
2021-07-29 15:33:51 +00:00
TreeHugger Robot
e5e712ab5d
Merge "Update the "Location services" header to be sentence case" into sc-dev am: 68d15388f4
am: 9409d32ef7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15404706
Change-Id: I46111002cedfcc3c34e6ae291cdc95e21a7f4ddb
2021-07-29 15:33:25 +00:00
TreeHugger Robot
84286f0ea1
Merge "Update the "Location services" header to be sentence case" into sc-dev am: 68d15388f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15404706
Change-Id: I25d5844d8dd7d58bcc84779441d8984db3efd07e
2021-07-29 15:21:53 +00:00
TreeHugger Robot
9409d32ef7
Merge "Update the "Location services" header to be sentence case" into sc-dev am: 68d15388f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15404706
Change-Id: I919eb96cae9c555e8cf37ad157ef9690e4bce8fd
2021-07-29 15:21:07 +00:00
TreeHugger Robot
14073ffdbb
Merge "Update the "Location services" header to be sentence case" into sc-dev am: 68d15388f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15404706
Change-Id: I0bc2e0daa4d6b8a5f404d853bf92999e42ef4a9b
2021-07-29 15:20:30 +00:00
TreeHugger Robot
68d15388f4
Merge "Update the "Location services" header to be sentence case" into sc-dev
2021-07-29 15:06:45 +00:00
TreeHugger Robot
ff94326a34
Merge "Fix Settings crash issue"
2021-07-29 07:25:15 +00:00
Weng Su
1caaf7447d
Fix Settings crash issue
...
- Add conditional checks to avoid UI updates when the fragment is
finishing or destoryed.
- Add conditional checks to avoid UI updates if the fragment resource is
not ready.
Bug: 185756174
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I506ee81985158b8992529440a31d2d5cfe81f441
2021-07-29 13:40:17 +08:00
TreeHugger Robot
3684220f2b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b515d34c40
-s ours am: 8f4ab88d14
-s ours am: 7d631b7a07
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413151
Change-Id: Icc2fb4a62026b702b7ad344ed9e3ea529a7f9c77
2021-07-29 00:21:14 +00:00
Bill Yi
643e8edc2b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8c818c3b4a
-s ours am: b13a1025fe
-s ours am: 11da8df2b2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413153
Change-Id: Ia57fe737911fc236b1e37b096d79ea67179526a3
2021-07-29 00:20:26 +00:00
TreeHugger Robot
7d631b7a07
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b515d34c40
-s ours am: 8f4ab88d14
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413151
Change-Id: I0fa72fb70b9df0bda989de5e410abb0a03148f43
2021-07-29 00:09:29 +00:00
Bill Yi
11da8df2b2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8c818c3b4a
-s ours am: b13a1025fe
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413153
Change-Id: Id705e0eabcb22c924e2defe443f65e9c326622ee
2021-07-29 00:08:58 +00:00
TreeHugger Robot
8f4ab88d14
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b515d34c40
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413151
Change-Id: Iccff1e583d8c6bf13a281c56d2e600319331bfed
2021-07-28 23:51:16 +00:00
Bill Yi
b13a1025fe
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8c818c3b4a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413153
Change-Id: I871599dec295a595cb19ef0441bca6579d96bd73
2021-07-28 23:50:46 +00:00
TreeHugger Robot
b515d34c40
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2021-07-28 23:37:43 +00:00
Bill Yi
8c818c3b4a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id06c20035f64636a8b7799fbb847fdf852b70e4b
2021-07-28 15:13:59 -07:00
Bill Yi
b23c15307c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ieede676484ceb3dbefc8c6aaf0b90a1043fe6ed1
2021-07-28 15:10:23 -07:00
Yu-Han Yang
1043fd1cf5
Update the "Location services" header to be sentence case
...
Bug: 191300716
Test: string update only
Change-Id: Ib1194847b9d2b817fa1b8581dc62cd2c1d85da26
2021-07-28 13:01:18 -07:00
SongFerngWang
13f8a461f8
Fix the wrong comparison am: 1bcba3d23f
am: 7f69cca1a9
am: bd9f646449
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15403429
Change-Id: I16a810cbe82193731c0bb20fff80cd1cf833fcfe
2021-07-28 17:29:29 +00:00
SongFerngWang
0c3025d665
Fix the wrong comparison am: 1bcba3d23f
am: 9d9d06ab24
am: 1d3acafa1f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15403429
Change-Id: Ie45c654f3ffa6665607e6a8047dbd1b8d9b728ac
2021-07-28 17:29:22 +00:00
SongFerngWang
bd9f646449
Fix the wrong comparison am: 1bcba3d23f
am: 7f69cca1a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15403429
Change-Id: Ic6fec56ca303d35846a8586496bc340649e3a6a9
2021-07-28 17:20:55 +00:00
SongFerngWang
e68517703c
Fix the wrong comparison am: 1bcba3d23f
am: b34e7441b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15403429
Change-Id: I795d28464a2aba4b59b1378af0673068bb13d545
2021-07-28 17:20:32 +00:00
Quang Luong
385bbda65e
Merge "Remove NetworkScoreManager from WifiTrackerLib classes"
2021-07-28 17:18:24 +00:00
SongFerngWang
1d3acafa1f
Fix the wrong comparison am: 1bcba3d23f
am: 9d9d06ab24
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15403429
Change-Id: I351acbe3d524aa58535001b5bd5101487625c11a
2021-07-28 17:13:31 +00:00
SongFerngWang
7f69cca1a9
Fix the wrong comparison am: 1bcba3d23f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15403429
Change-Id: I226de23b9e147ccf66cbbc57821b8244991f1363
2021-07-28 17:05:38 +00:00
SongFerngWang
b34e7441b5
Fix the wrong comparison am: 1bcba3d23f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15403429
Change-Id: Id6ad78de25683cab8118427f073c2fd04825d77f
2021-07-28 17:04:53 +00: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
Betty Chang
f08648ab56
Merge "Support RTL mode in Sim switch dialog"
2021-07-28 07:58:05 +00:00
Zoey Chen
ea5e46e05b
Merge "[BackupCall] The toggle doesn't work when try to disable/enable it." into sc-dev am: 1a6982f195
am: 046c8d4a97
am: 9b02edad2b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372352
Change-Id: I155c58b5ad9bc2fdcb62eb7be2423d1545227d64
2021-07-28 04:09:52 +00:00
Zoey Chen
ec8a799bd2
Merge "[BackupCall] The toggle doesn't work when try to disable/enable it." into sc-dev am: 1a6982f195
am: b1bd0b6d26
am: 6fd3e3cb5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372352
Change-Id: I15d402c8b04c21182ccefb0ad08f5b7a194d535f
2021-07-28 04:09:36 +00:00