Joe Bolinger
f70f34b63d
Merge "Use RestrictedPreference for all biometric settings." into sc-dev am: 7e9077fd14
am: 046bad89bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15394293
Change-Id: If4a680fbd11aee165d034210557cef75e20404a1
2021-07-27 17:59:12 +00: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
Bonian Chen
3e839e0aef
Merge "[Settings] SIM summary subtitle display "null" when Fi SIM"
2021-07-27 12:09:34 +00:00
Bonian Chen
a8ce9abde7
[Settings] SIM summary subtitle display "null" when Fi SIM
...
This is a case where two Fi SIM are within device.
Try to aggregate them when they got same group UUID.
Bug: 194761536
Test: local
Change-Id: I669e65dba6b5508f8cde88695f45eb459cd29474
2021-07-27 09:36:07 +00:00
Bill Yi
2f8d8405bf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 187263e4a2
-s ours am: 1c95bda96f
-s ours am: 596a6d3342
-s ours am: 8a777b7c80
-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: I72a6f71bda49439d2373d6c5707a4fe37e46632b
2021-07-27 07:38:18 +00:00
Bill Yi
9e3c3dd21e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 187263e4a2
-s ours am: 1c95bda96f
-s ours am: 927010cb2b
-s ours am: 26e5a702b3
-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: I3fe9bd7f79903c1c28673c94ad51372556b5e542
2021-07-27 07:37:59 +00:00
Bill Yi
8a777b7c80
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 187263e4a2
-s ours am: 1c95bda96f
-s ours am: 596a6d3342
-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: I3dbbc9cc2d2a2e082e351dd891027801eaadb2d1
2021-07-27 07:28:56 +00:00
Bill Yi
26e5a702b3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 187263e4a2
-s ours am: 1c95bda96f
-s ours am: 927010cb2b
-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: I86bb699b2f895e0f00001e1d649c96bad56a1770
2021-07-27 07:27:55 +00:00
Bill Yi
a8fa4dfe88
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 187263e4a2
-s ours am: 1c95bda96f
-s ours am: b6be9a22b5
-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: If17ec294c49147181b40f89261f70cdc194289a7
2021-07-27 07:27:31 +00:00
Bill Yi
927010cb2b
[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: I113635f56023acb41302b70bc86f327654ddd00f
2021-07-27 07:11:44 +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
596a6d3342
[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: Id80649a7462ea17ef32755cbad4986cbdce91eb9
2021-07-27 07:08:43 +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
3cb96053a8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 507d6814a4
-s ours am: 12f186ff22
-s ours am: 0c72e5ebb2
-s ours am: 456e4daf5d
-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: Ia2dfacad79b23fa86d73952cbfc22bda2a2a73b6
2021-07-27 06:58:25 +00:00
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
456e4daf5d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 507d6814a4
-s ours am: 12f186ff22
-s ours am: 0c72e5ebb2
-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: I16a967ef7780fdafabb1de98c77fdd2f69534569
2021-07-27 06:53:06 +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
0c72e5ebb2
[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: Iecf073eb716e3b95b42e914425551841f2ceb825
2021-07-27 06:38:34 +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
Bill Yi
187263e4a2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idc5958063a2353ecaf65a34be2c76d0c4ca8f8f5
2021-07-27 03:12:55 +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
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