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
|
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
|
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
|
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 |
|
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 |
|
Joe Bolinger
|
f030dfe110
|
Minor language changes for enrollment flow.
Bug: 188847063
Test: manual
Change-Id: I3014255e45dbe2e07de505b3ab80258ab1903281
|
2021-06-18 11:57:39 -07:00 |
|
Julia Reynolds
|
6a603e7f4b
|
Clean up notification settings
- Reorganize settings
- Fix dividers
- Add icons
- Fix titles
- Fix colors
- Fix indentation
- Add summaries
Fixes: 190079590
Test: manual inspection, robotests
Change-Id: Ia03219575d3b0c78f9f9b088aa3cdaa29cfdf412
|
2021-06-18 14:36:20 -04:00 |
|
Joe Bolinger
|
503f8e2fc8
|
Merge changes from topic "unicorn-1" into sc-dev am: 0fcac8bf0d am: d1935d9166
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972492
Change-Id: Ia49a4cd87c10e8f7c75396585dfa09f7cfaf5dc8
|
2021-06-18 17:05:26 +00:00 |
|
Joe Bolinger
|
e64ae5b82a
|
Add plumbing and placeholder screens for parental consent flow. am: a8808f7368 am: d93f9c0df3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14939648
Change-Id: If6fc48249318e4161f2ced49f313b1c411087eac
|
2021-06-18 17:05:24 +00:00 |
|
Joe Bolinger
|
39c6541ded
|
Merge changes from topic "unicorn-1" into sc-dev am: 0fcac8bf0d am: b41e6f1891
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972492
Change-Id: Id9f9a4a1efaa956b40950e74e0feeae30b154c1c
|
2021-06-18 17:04:20 +00:00 |
|
Joe Bolinger
|
b41e6f1891
|
Merge changes from topic "unicorn-1" into sc-dev am: 0fcac8bf0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972492
Change-Id: I2ba11356af233c13224f4f3113a90e7c68520962
|
2021-06-18 16:42:52 +00:00 |
|
Joe Bolinger
|
d1935d9166
|
Merge changes from topic "unicorn-1" into sc-dev am: 0fcac8bf0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972492
Change-Id: If0c6901245d3d99af5c16dd3f1304222f6fd1e82
|
2021-06-18 16:42:03 +00:00 |
|
Joe Bolinger
|
d93f9c0df3
|
Add plumbing and placeholder screens for parental consent flow. am: a8808f7368
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14939648
Change-Id: Ic145a1ccf5f1655d60832c740cfb14112fa4dd58
|
2021-06-18 16:42:01 +00:00 |
|
Joe Bolinger
|
0fcac8bf0d
|
Merge changes from topic "unicorn-1" into sc-dev
* changes:
Update strings for parental consent flow in setup wizard.
Add plumbing and placeholder screens for parental consent flow.
|
2021-06-18 16:28:27 +00:00 |
|
Xin Li
|
9ee53d896a
|
[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: e774cf9cd3 -s ours am: 8fb9108c37 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15024196
Change-Id: Ib4a0331d977f8ffa744767388a5367a746385bfe
|
2021-06-18 11:54:22 +00:00 |
|
Xin Li
|
8fb9108c37
|
[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: e774cf9cd3 -s ours
am skip reason: Merged-In I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15024196
Change-Id: I6f8d81d2fa7d313ea79e1433a2c16a3145e4f2a9
|
2021-06-18 11:42:23 +00:00 |
|
TreeHugger Robot
|
5a3395ec74
|
Merge "Revert "Disable RecyclerView animation to fix the broken UI"" into sc-dev am: d6b3885ef5 am: 0c0bc06511
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016147
Change-Id: I3ff14d29f5a30c15f00e495aa8ddcc57f91a6682
|
2021-06-18 11:17:38 +00:00 |
|
TreeHugger Robot
|
36e5af8c6c
|
Merge "Revert "Disable RecyclerView animation to fix the broken UI"" into sc-dev am: d6b3885ef5 am: 3fbade73be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016147
Change-Id: I8aeb029eaa5d75a958222bc558d603b223627f29
|
2021-06-18 11:17:18 +00:00 |
|