Bill Yi
ae22609e89
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 12b1ae00b8
-s ours am: ef1f1fcb63
-s ours am: c53be885af
-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: I7e487ec8aa98630c9c9e4733a675b8df5a32b9f5
2021-07-27 06:58:21 +00:00
Bill Yi
6074ed0a2f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 507d6814a4
-s ours am: 12f186ff22
-s ours am: 0b297383f3
-s ours am: e68da77d6d
-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: I3a3100871992b0dfa344553aa339a6b76bb59d9f
2021-07-27 06:58:07 +00:00
Bill Yi
510f6c9265
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 12b1ae00b8
-s ours am: fed025e2e3
-s ours am: c121a7cc08
-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: Ibeb46cdb976c1ae53cbc726e962ab331f4a4998e
2021-07-27 06:57:53 +00:00
Bill Yi
c53be885af
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 12b1ae00b8
-s ours am: ef1f1fcb63
-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: I21d129f6ddce2512364b5edeb256b75d98b4a53d
2021-07-27 06:52:59 +00:00
Bill Yi
e68da77d6d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 507d6814a4
-s ours am: 12f186ff22
-s ours am: 0b297383f3
-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: I884516273985d753be347aecd111e37207b72081
2021-07-27 06:48:27 +00:00
Bill Yi
c121a7cc08
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 12b1ae00b8
-s ours am: fed025e2e3
-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: Ife6c5467bbb923eac290c2cbede402d7a2fbfead
2021-07-27 06:48:22 +00:00
Bill Yi
d38d2892ba
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 507d6814a4
-s ours am: 12f186ff22
-s ours am: b6124410d9
-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: I5c023fb04a3ffa9a60f5b5a2aeca3f45572d8d6d
2021-07-27 06:47:08 +00:00
Bill Yi
6d33ddb582
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 12b1ae00b8
-s ours am: 96bbf8e507
-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: I45841a5b2db73b368064725aeeaa142f76a5a5bb
2021-07-27 06:47:03 +00:00
Bill Yi
82bab3b515
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 421a5f395a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15394297
Change-Id: I5dc3626a33752928a0296c75d0b97344a5559548
2021-07-27 06:46:57 +00:00
Bill Yi
0b297383f3
[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: I0f1be110fcb3b95b00595d2945359491fbbeb2a8
2021-07-27 06:39:55 +00:00
Bill Yi
ef1f1fcb63
[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: I44352b938d84b3c0ae344e9e23197ef2a8da85ed
2021-07-27 06:38:09 +00:00
TreeHugger Robot
652771656d
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-07-27 06:36:58 +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
b2a4d26909
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 39dcf7b2af
-s ours am: 10d2cc00fb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15390121
Change-Id: I16a5ba0a6025dd038f523f8afbbc060bf43f8680
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
fed025e2e3
[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: I41a0fcfdd6c0b4da9a0e32e03bcd44201d65508a
2021-07-27 06:35:07 +00:00
Bill Yi
10d2cc00fb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 39dcf7b2af
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15390121
Change-Id: I027ddc12439243cfe1041607d7082d3231307a90
2021-07-27 06:20:10 +00:00
Bill Yi
39dcf7b2af
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I679b7a76538b3e94f2d564bacb6d8db4462d5717
2021-07-27 03:42:49 +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
6267a5ac1f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If983f0dc9d01a7257f0f44e838ba72f4f882f462
2021-07-27 03:35:26 +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
Bill Yi
421a5f395a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3060fdb585a5ece0b8cde0ed377c0aa7b4086a8f
2021-07-27 03:16:24 +00:00
Quang Luong
59e8268954
Merge "Rename Enhanced MAC Randomization to Non-Persistent"
2021-07-26 16:20:27 +00:00
Peter Kalauskas
40528b5b36
Merge "Fix: change owner name when account setup" into sc-dev am: c9076d3d36
am: 6804d23658
am: 82f54ab85d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15377999
Change-Id: Ifc28b22538c20545c49ba81eb8ed7fd3331ff520
2021-07-26 15:28:55 +00:00
Peter Kalauskas
4a08ddbdf0
Merge "Fix: change owner name when account setup" into sc-dev am: c9076d3d36
am: 3f3c7b7762
am: 3a8d2b2fef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15377999
Change-Id: Ied1417c52d830ffbee91b06093563f431bffe389
2021-07-26 15:28:48 +00:00
Peter Kalauskas
82f54ab85d
Merge "Fix: change owner name when account setup" into sc-dev am: c9076d3d36
am: 6804d23658
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15377999
Change-Id: If357e1ed1924ea52530d2ed5de363469f99b85ec
2021-07-26 15:23:41 +00:00
Peter Kalauskas
b264d3a9af
Merge "Fix: change owner name when account setup" into sc-dev am: c9076d3d36
am: a7f2f06bd4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15377999
Change-Id: I348926ec96c0feea6ae941f6e7bf6aef4fd231ae
2021-07-26 15:23:19 +00:00
Peter Kalauskas
3a8d2b2fef
Merge "Fix: change owner name when account setup" into sc-dev am: c9076d3d36
am: 3f3c7b7762
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15377999
Change-Id: If85253c1d6ed28e12cf3f8156e83c6f8eb7c14d4
2021-07-26 15:19:27 +00:00
Peter Kalauskas
6804d23658
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: I72de49d2efd13e19160a5387bd7947e111e5aa27
2021-07-26 15:09:41 +00:00
Peter Kalauskas
a7f2f06bd4
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: Icca5f3cbe2ba979636938b90acbfa1598b8d678d
2021-07-26 15:08:31 +00: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
0b7c5ed31c
Merge "[Provider Model] Correct the Settings shortcut of the Settings Widget"
2021-07-26 09:55:14 +00:00
Weng Su
658a417205
[Provider Model] Correct the Settings shortcut of the Settings Widget
...
The Settings is used the "Internet" settings instead of "Wi-Fi" settings
after Provider Model enabled.
The Settings shortcut of the Settings widget should update below.
- Remove "Wi-Fi" shortcut from the Settings widget
- Correct the "Network & internet" shortcut to "Internet"
Bug: 194644851
Test: manual test
atest -c SettingsUnitTests
make RunSettingsRoboTests
Change-Id: I488327a01f5e539ecbe315b7016f65084dfd59a1
2021-07-26 16:33:31 +08:00
Bonian Chen
4f2a97987b
Merge "[Settings] Allow disabled SIM to be controlled in UI"
2021-07-26 05:00:12 +00:00
TreeHugger Robot
6a73dba20a
Merge "Use correct user ID for face bypass pref controller" into sc-dev am: ae23247270
am: 7364b38193
am: 7303f135f9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379629
Change-Id: I639b43d233d7308dcca17d1676e448bf718d29c6
2021-07-24 19:22:45 +00:00
TreeHugger Robot
7e65417b97
Merge "Use correct user ID for face bypass pref controller" into sc-dev am: ae23247270
am: 7993875a8e
am: 923b048d73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379629
Change-Id: I9baf1c9499e8b2bff6a96f503f5e605ca67cb53c
2021-07-24 19:22:38 +00:00
TreeHugger Robot
7303f135f9
Merge "Use correct user ID for face bypass pref controller" into sc-dev am: ae23247270
am: 7364b38193
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379629
Change-Id: I9597670776e93d68ca062e9e934b5a5c93460dac
2021-07-24 19:12:42 +00:00
TreeHugger Robot
923b048d73
Merge "Use correct user ID for face bypass pref controller" into sc-dev am: ae23247270
am: 7993875a8e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379629
Change-Id: Iedd478cd368b79d2bc1c409da28cbf20ca9bafc7
2021-07-24 19:11:53 +00:00
TreeHugger Robot
20948a6bac
Merge "Use correct user ID for face bypass pref controller" into sc-dev am: ae23247270
am: 2db28ba980
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379629
Change-Id: I8b44af8077061db5ef3c3c4fae48762e1afe8787
2021-07-24 19:11:28 +00:00
TreeHugger Robot
7993875a8e
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: I29147e9d2400dbdccde9c63f15deb79240a2dd66
2021-07-24 19:00:27 +00:00
TreeHugger Robot
2db28ba980
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: I866551841738574d0073639bd9b3ffa8856d9aba
2021-07-24 18:58:52 +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
Bonian Chen
847f326cd4
[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
Test: local
Change-Id: I9c8b8fa16e74cd0fe4419966cc97ad55b5b87b17
2021-07-24 14:42:37 +00:00
Tom Hsu
022d61cee8
Merge "[Settings] Fix problem that MobileNetworkActivity show wrong Info." into sc-dev am: d3d3161695
am: 50cacb7ef4
am: 82a0d44bc4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372364
Change-Id: I268258e90a74bea8c60d562cc090a422d6231ff5
2021-07-24 07:11:40 +00:00
Tom Hsu
323a5cc0e2
Merge "[Settings] Fix problem that MobileNetworkActivity show wrong Info." into sc-dev am: d3d3161695
am: 10af4a87fb
am: b114cda66f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372364
Change-Id: I4e1ac5b9253011721b49dc95aa5b59198bc76cac
2021-07-24 07:11:32 +00:00
Tom Hsu
82a0d44bc4
Merge "[Settings] Fix problem that MobileNetworkActivity show wrong Info." into sc-dev am: d3d3161695
am: 50cacb7ef4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372364
Change-Id: I740ea44f427047f1b8bd2a682f66b58ff91513f7
2021-07-24 06:59:48 +00:00