TreeHugger Robot
a11e5bea20
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2021-08-05 05:04:34 +00:00
Bill Yi
e1215a0076
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie6e1199c352f2d98b0381565375fcf7330ee70cc
2021-08-05 02:34:25 +00:00
TreeHugger Robot
0d61ec8ebf
Merge "Fix text styling for choose pattern/password screens" into sc-dev am: 66a2f625e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463175
Change-Id: I7c40fd94251b22a6c97356522d0ae302f0c3e652
2021-08-04 23:55:54 +00:00
TreeHugger Robot
66a2f625e4
Merge "Fix text styling for choose pattern/password screens" into sc-dev
2021-08-04 23:44:35 +00:00
Curtis Belmonte
6ee789e380
Fix text styling for choose pattern/password screens
...
Test: Manually trigger SUW and set a device pattern
Fixes: 195069195
Change-Id: Ib19fd0e827af5bdc0896ab4c8cc4fdb8f582cf71
2021-08-04 15:14:38 -07:00
Peter Wang
429dc94cfa
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: Id9bfd7d9b9668d8fdeb0251902c1002a99ff833e
2021-08-04 18:06:15 +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
1741a0bd6c
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: Ie4cfa9b52049abd6e8e4fb5f152cecbed0c602ab
2021-08-04 07:29:18 +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
Joe Bolinger
c76d3e5af7
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: I9d2c3c9daf090f26244f42b730507ba64a279500
2021-08-02 21:27:44 +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
Bill Yi
295b1bb97b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5d2e077c7
-s ours am: 6deca0cd6b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15428746
Change-Id: Iec3a965e95f539c618044b241380e9af19dc20a6
2021-07-30 14:53:05 +00:00
Bill Yi
6deca0cd6b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5d2e077c7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15428746
Change-Id: I02489ddc8a2047d651d7bf64ff98a75c6c90cd6a
2021-07-30 14:42:43 +00:00
Bill Yi
54f684bdda
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 296d41309e
-s ours am: 16693aaca0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15428749
Change-Id: I91104e537f92974876be8d590f01db23257fdb48
2021-07-30 14:21:12 +00:00
Bill Yi
16693aaca0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 296d41309e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15428749
Change-Id: I472c9c04799848a0382c2af447d442b73bad4bd0
2021-07-30 14:16:37 +00:00
TreeHugger Robot
243ae3b151
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7399e2deaa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15430931
Change-Id: I7a7ac84fbdc83e0e2b7facfe8a157a82282d0cd0
2021-07-30 14:16:34 +00:00
TreeHugger Robot
57d9cf9f25
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2021-07-30 14:15:01 +00:00
TreeHugger Robot
7399e2deaa
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-07-30 14:07:33 +00:00
Bill Yi
63c32865cc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I66bde249f1f3d460a40ccd3fb9daf61f7be202dd
2021-07-30 12:06:46 +00:00
Bill Yi
296d41309e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0e84b422b86e7195aac236b569828f1a0760ad7e
2021-07-30 11:53:32 +00:00
Bill Yi
99ef4ec5fb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iab11c36fd772ae3aefc76bf063199db279be2450
2021-07-30 11:42:43 +00:00
Bill Yi
e5d2e077c7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8c108f50853f1de14c4df8d52bdcc4211f05278b
2021-07-30 11:39:05 +00:00
TreeHugger Robot
f719dd7a6c
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: Iede0416114c004a9f66c8a93fdd05cd22d53ff26
2021-07-30 08:32:02 +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
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
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
405fac1ca0
Merge "Set toggle state for profile group" into sc-dev
2021-07-29 19:45:59 +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
68d15388f4
Merge "Update the "Location services" header to be sentence case" into sc-dev
2021-07-29 15:06:45 +00: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
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
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
e41c038d28
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: I40168b153673be9e93277e8af11e5c4c0e54bd8c
2021-07-28 03:40:15 +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
046bad89bd
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: Id270d41c8ccc633fe14ff6dd9480a7ee7f322e1c
2021-07-27 17:41:44 +00:00
Joe Bolinger
7e9077fd14
Merge "Use RestrictedPreference for all biometric settings." into sc-dev
2021-07-27 17:25:25 +00:00
Bill Yi
b6be9a22b5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 187263e4a2
-s ours am: 1c95bda96f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15394296
Change-Id: Ide605b3eb2e65f821cf0b263509c334d1000388b
2021-07-27 07:10:25 +00:00
Bill Yi
1c95bda96f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 187263e4a2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15394296
Change-Id: I6623f4d49330b78682638bb8f825959a4d3c6a8b
2021-07-27 06:59:05 +00:00
Bill Yi
b6124410d9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 507d6814a4
-s ours am: 12f186ff22
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15394299
Change-Id: Ied328e1780741a44addbd2b8c15b4cf44367e8d7
2021-07-27 06:36:49 +00:00
Bill Yi
96bbf8e507
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 12b1ae00b8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15396086
Change-Id: I96161907ac5b828d24d94c850eba618c3feedb36
2021-07-27 06:36:46 +00:00
Bill Yi
12f186ff22
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 507d6814a4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15394299
Change-Id: I1e9b9d78e302e5b5974476cba9a88407f7bcb73e
2021-07-27 06:36:44 +00:00
Bill Yi
12b1ae00b8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0d8bd7744e7bcc261f6745c70584860391e423f2
2021-07-27 03:39:15 +00:00
Bill Yi
507d6814a4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifbfc76908c45f5db6d7eff811d31a3eee810231f
2021-07-27 03:26:34 +00:00