Commit Graph

86178 Commits

Author SHA1 Message Date
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
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
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
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
Zoey Chen
9b02edad2b Merge "[BackupCall] The toggle doesn't work when try to disable/enable it." into sc-dev am: 1a6982f195 am: 046c8d4a97
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372352

Change-Id: Ib7b517dea848d9f8c8e2d30bc180c700f7df10e5
2021-07-28 03:56:37 +00:00
Zoey Chen
6fd3e3cb5c Merge "[BackupCall] The toggle doesn't work when try to disable/enable it." into sc-dev am: 1a6982f195 am: b1bd0b6d26
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372352

Change-Id: I37592a253e749af077b93215c8149dd5f2702b0c
2021-07-28 03:56:16 +00:00
Zoey Chen
b1bd0b6d26 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: Ib65987eb078f9fc0d6995470031d879cc1d8ece4
2021-07-28 03:41:00 +00: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
Joe Bolinger
26424cb7b8 Merge "Use RestrictedPreference for all biometric settings." into sc-dev am: 7e9077fd14 am: 70e4c3474a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15394293

Change-Id: Ie42b966a683b8478dedc1dbd6003e0d0ff1a0bd9
2021-07-27 17:59:38 +00:00
Joe Bolinger
ca784dd5df Merge "Use RestrictedPreference for all biometric settings." into sc-dev am: 7e9077fd14 am: 1841f0f132
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15394293

Change-Id: I9247aa39c6ca271175cd8634803935653aaf5e4e
2021-07-27 17:54:59 +00:00
Joe Bolinger
70e4c3474a 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: I39c616c70076dd98e24d138a0459d4914511a677
2021-07-27 17:43:00 +00: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
7e9077fd14 Merge "Use RestrictedPreference for all biometric settings." into sc-dev 2021-07-27 17:25:25 +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
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
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
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
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
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
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
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
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
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
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
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