PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,673 Commits 1 Branch 0 Tags
c67736416d8f7c6c6b068f060984e098ccc9f8cc
Commit Graph

84673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
8237b4510d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-20 17:41:40 +00:00
Bill Yi
55ef19a28e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia0f88a709ad6a6d00fe86dd0141fb325694fc339
 2021-06-20 10:48:57 +00:00
Bill Yi
00bfaf371a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibc203bcf5b84e5e4417f919e7d27b5fb66b61e32
 2021-06-20 10:45:30 +00:00
Bill Yi
6cb17b2688 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I847984e756fe6b8d27be1674b918434e701e44b7
 2021-06-20 10:37:59 +00:00
Bill Yi
850f596669 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id98f5fdc25d11e421b134c999a2fb013b9ef6b38
 2021-06-20 10:36:28 +00:00
Bill Yi
09dee72fe2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I58231a0d3bef29b32381ee5031df333c7bb9efa9
 2021-06-20 10:32:25 +00:00
Bill Yi
690868f6ec Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib4dbb5fbabf25f423c50ce68f36f9a4efa3b3579
 2021-06-20 10:29:02 +00:00
Bill Yi
e1e77e7c1f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib780c3fa72b2f9e7f50c0e99a3be71e857c99419
 2021-06-20 10:21:37 +00:00
Bill Yi
57bd12b969 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id369ce159e6764a4709384de39ccebb780fe0d8f
 2021-06-20 10:16:43 +00:00
Bill Yi
41efad3b24 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c4acab637e -s ours am: b4f59a75d5 -s ours am: cc6166a718 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15038493

Change-Id: Ib64d716107884ec5f84f3854dc66057ac5d0a064
 2021-06-20 01:43:28 +00:00
Bill Yi
04649e54b3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4491f38fe -s ours am: ef4d7891fc -s ours am: d872d81418 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15038491

Change-Id: Ife7ced63eb0b50470190dcd736104fb454f94f96
 2021-06-20 01:43:23 +00:00
Bill Yi
e4e5409f01 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c4acab637e -s ours am: b4f59a75d5 -s ours am: da2cdce082 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15038493

Change-Id: I0e18a975752e118016b13df1701e40ded506a44a
 2021-06-20 01:40:06 +00:00
Bill Yi
a2960d739e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4491f38fe -s ours am: ef4d7891fc -s ours am: 8d9970bd1b -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15038491

Change-Id: I343a43fc0f8fa4b69a18e0c201c77066d4cd77af
 2021-06-20 01:40:02 +00:00
Bill Yi
da2cdce082 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c4acab637e -s ours am: b4f59a75d5 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15038493

Change-Id: I76d543e751a4f3791a011d81ebcc17a6b08493ec
 2021-06-20 01:30:21 +00:00
Bill Yi
cc6166a718 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c4acab637e -s ours am: b4f59a75d5 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15038493

Change-Id: I84564a8e7972c85c1cd49d0243e159a9c83480c2
 2021-06-20 01:26:33 +00:00
Bill Yi
d872d81418 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4491f38fe -s ours am: ef4d7891fc -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15038491

Change-Id: Id95b977b19d7e1e71471ea4ce4c451ba4a41f624
 2021-06-20 01:26:26 +00:00
Bill Yi
b4f59a75d5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c4acab637e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15038493

Change-Id: I3105c704d4375b849821e110ec5bd667c7a79a79
 2021-06-20 01:25:35 +00:00
Bill Yi
8d9970bd1b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4491f38fe -s ours am: ef4d7891fc -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15038491

Change-Id: I90585d6c88a3bedef0b51ab569520ee90e1f4ebd
 2021-06-20 01:25:35 +00:00
Bill Yi
2b55fc02bc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6e25ad9d0e -s ours am: 8c036009fa -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15038495

Change-Id: I50e7c56ae135ddf97cb56c27c080dda57de33958
 2021-06-20 01:13:45 +00:00
Bill Yi
f0850e0c79 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6e25ad9d0e -s ours am: c2ac7c9afe -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15038495

Change-Id: I2071adeaa7a6c86a54ade245bd644921f3f82b5b
 2021-06-20 01:13:24 +00:00
Bill Yi
ef4d7891fc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4491f38fe -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15038491

Change-Id: I8eae3603e7571d8d25da53f842adf74730ea4a47
 2021-06-20 01:13:22 +00:00
Bill Yi
c2ac7c9afe [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6e25ad9d0e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15038495

Change-Id: I495abbba6bca8b6fa5ee37152ea7713f3375e684
 2021-06-20 00:59:10 +00:00
Bill Yi
8c036009fa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6e25ad9d0e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15038495

Change-Id: I7e4ba4299522579c1a263314c2b459d50c2759fc
 2021-06-20 00:57:02 +00:00
Bill Yi
6e25ad9d0e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Icab92cfaa703d3b2eef26acef9a60a846dc7cf4c
 2021-06-19 21:10:37 +00:00
Bill Yi
c4acab637e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I21e8f76e5783f6c7ef9387905ac612e4807fb7fd
 2021-06-19 21:06:18 +00:00
Bill Yi
e4491f38fe Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibbd38194fc7cd9d2de7c28a8dc424b54e912904a
 2021-06-19 20:55:30 +00:00
TreeHugger Robot
eecd553592 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f64fbb6830 -s ours am: bca9de1a1f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15032709

Change-Id: I5cc075f47de25e2ac4439ec1d3baf571384976be
 2021-06-19 05:22:17 +00:00
Bill Yi
8c71058404 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5fd0405e56 -s ours am: e1a2aaaeee -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15032890

Change-Id: I6a1b91723bcc70121b9d006f9f45c20014a40d44
 2021-06-19 05:21:50 +00:00
TreeHugger Robot
cb633707cd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f64fbb6830 -s ours am: 27030bf747 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15032709

Change-Id: I23b1299e6f321778e5da3acebbedd05de681636e
 2021-06-19 05:21:46 +00:00
Bill Yi
097ebabf56 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5fd0405e56 -s ours am: 268296fca5 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15032890

Change-Id: Ifedc0843a6bfbe0610f98b5f09aa2bb745ba833a
 2021-06-19 05:21:41 +00:00
TreeHugger Robot
27030bf747 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f64fbb6830 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15032709

Change-Id: I925b83ca8720e8af235a9324cbd55fe12fe553d3
 2021-06-19 05:00:05 +00:00
Bill Yi
268296fca5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5fd0405e56 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15032890

Change-Id: I418a7b9f7b023ea8054886a4a5c4a72952aaf3d0
 2021-06-19 04:59:41 +00:00
TreeHugger Robot
bca9de1a1f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f64fbb6830 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15032709

Change-Id: I829eedaff2f52c88faf65133fa0153e71c89fe14
 2021-06-19 04:58:56 +00:00
Bill Yi
e1a2aaaeee [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5fd0405e56 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15032890

Change-Id: I28888e778a57ee2ed30a7e86645ab2d8d797bf5c
 2021-06-19 04:58:23 +00:00
TreeHugger Robot
f64fbb6830 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-19 04:47:11 +00:00
Bill Yi
5fd0405e56 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id6aad69dfd45e4ba4a299002bfa12893e3845e4b
 2021-06-19 02:49:49 +00:00
Bill Yi
91f62efa71 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I04288f7d2a660dbcf875f6e7ca997414868ac819
 2021-06-19 02:46:21 +00:00
Joe Bolinger
b56ed45d79 Merge "Minor language changes for enrollment flow." into sc-dev am: 18c58e9c11 am: 24f6ac00a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029786

Change-Id: I682aa05649f37ead01b7bb5b5cf95b205d97757d
 2021-06-18 20:57:51 +00:00
Joe Bolinger
b42af02558 Merge "Minor language changes for enrollment flow." into sc-dev am: 18c58e9c11 am: 0f15895bdf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029786

Change-Id: Ie030ce79a5886a7122b41cb74280d2d7ece99f05
 2021-06-18 20:57:29 +00:00
Joe Bolinger
0f15895bdf Merge "Minor language changes for enrollment flow." into sc-dev am: 18c58e9c11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029786

Change-Id: Icd5e4b67c4d68efb12fa6232e8a8a9b7b80b280c
 2021-06-18 20:44:18 +00:00
Joe Bolinger
24f6ac00a0 Merge "Minor language changes for enrollment flow." into sc-dev am: 18c58e9c11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029786

Change-Id: I249e368ccdf54d31912bde1c07ed8acee8f43f86
 2021-06-18 20:43:29 +00:00
Joe Bolinger
18c58e9c11 Merge "Minor language changes for enrollment flow." into sc-dev 2021-06-18 20:31:28 +00:00
Joe Bolinger
2976b9bc14 Add new enum for parental consent UI. 
Bug: 188847063
Test: manual
Change-Id: I7b101f0d7cda415695ecdb7963a0e514c875b95c
 2021-06-18 13:30:23 -07:00
Julia Reynolds
56b09967ae Clean up notification settings am: 6a603e7f4b am: 09d9da5624 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029783

Change-Id: I494570bde4b2121828c52f9224f5f2ed382e476f
 2021-06-18 20:18:42 +00:00
Julia Reynolds
576d29c9db Clean up notification settings am: 6a603e7f4b am: 7c5f01e560 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029783

Change-Id: Ic943d1f7942fac9972378baeeb8908f6aa60ce9e
 2021-06-18 20:14:23 +00:00
Julia Reynolds
09d9da5624 Clean up notification settings am: 6a603e7f4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029783

Change-Id: I598eab57e624ebc0c3ecdeafa5d02f6e8f18d244
 2021-06-18 20:00:32 +00:00
Julia Reynolds
7c5f01e560 Clean up notification settings am: 6a603e7f4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029783

Change-Id: Id71b02bdc58f92e8c7cf170d1613d3bfc49c81ab
 2021-06-18 19:59:09 +00:00
Xin Li
88f92cb4db DO NOT MERGE - Merge RQ3A.210605.005 
Bug: 190855093
Merged-In: I73964718e9b3d66dbe189f48bfe6d1b16ec921f4
Change-Id: Id888e72e86cbc130fec23dd7645d1ceea1ce319d
 2021-06-18 12:24:37 -07:00
Joe Bolinger
f030dfe110 Minor language changes for enrollment flow. 
Bug: 188847063
Test: manual
Change-Id: I3014255e45dbe2e07de505b3ab80258ab1903281
 2021-06-18 11:57:39 -07:00
Joshua Mccloskey
3bd11c302a Added fp_bad_calibration to fp enrollment. 
Test: Verified error message shows during enrollment.
Bug: 189133688
Change-Id: Ib1b47f5fff16d801b88247cc01a32de88c2ecd66
 2021-06-18 11:49:55 -07:00