PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,565 Commits 1 Branch 0 Tags
f4e837e5551f0f1672885b2b973a77dbc78f049e
Commit Graph

89565 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
f4e837e555 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6ccadb92d9af8e7b95693b1629f6921d241be5e1
 2021-06-19 21:09:05 +00:00
TreeHugger Robot
5a0caae7ec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f64fbb6830 -s ours am: f098487033 -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: I551becbae5c5b8ac01c4e12753a068c47625dd19
 2021-06-19 05:21:29 +00:00
Bill Yi
06d94579ca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5fd0405e56 -s ours am: 789602b466 -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: Ib67f5ccf85795486b7cb6bcdc0f2fe7459088191
 2021-06-19 05:21:07 +00:00
TreeHugger Robot
f098487033 [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: I2b8e9afce7f1a903f8ebd79eb616bc6f75f8cd47
 2021-06-19 04:58:34 +00:00
Bill Yi
789602b466 [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: I406a93337e4dce3e654056dbed7c21490de0848b
 2021-06-19 04:58:27 +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
82991ce02b Merge "Minor language changes for enrollment flow." into sc-dev am: 18c58e9c11 am: 24f6ac00a0 am: b56ed45d79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029786

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

Change-Id: I07cc31b733b873cb9bef48625e891d0b09a843dc
 2021-06-18 21:14:08 +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
3c14bb21a3 Merge "Minor language changes for enrollment flow." into sc-dev am: 18c58e9c11 am: 3ac223e29a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029786

Change-Id: I4920c86b882a2b078f62a405f8244dd2600d2949
 2021-06-18 20:57:19 +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
3ac223e29a 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: I0b49aa7765e27333e5bb5116ecceb4c7ae0fc3de
 2021-06-18 20:43:27 +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
539449ac37 Clean up notification settings am: 6a603e7f4b am: 09d9da5624 am: 56b09967ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029783

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

Change-Id: I7da16872c59e518b15782f9b7e230e25c4d1675f
 2021-06-18 20:27:01 +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
c8e82bb167 Clean up notification settings am: 6a603e7f4b am: 2ae83f85d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029783

Change-Id: Idedee8c5e89cbc1abd847f806964ba866b491f27
 2021-06-18 20:13:36 +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
Julia Reynolds
2ae83f85d6 Clean up notification settings am: 6a603e7f4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029783

Change-Id: I505da7ca75d728c79a9f39aabf871baf8491b988
 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
3badbf7019 Merge changes from topic "unicorn-1" into sc-dev am: 0fcac8bf0d am: d1935d9166 am: 503f8e2fc8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972492

Change-Id: Id4908094337dedd1be8d334713f8380e6f372a68
 2021-06-18 17:17:49 +00:00
Joe Bolinger
4b24b0d52d Add plumbing and placeholder screens for parental consent flow. am: a8808f7368 am: d93f9c0df3 am: e64ae5b82a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14939648

Change-Id: I566b1373f55bba54e67fcfc7e2ac8f63e6827a06
 2021-06-18 17:17:48 +00:00
Joe Bolinger
56074b4335 Merge changes from topic "unicorn-1" into sc-dev am: 0fcac8bf0d am: b41e6f1891 am: 39c6541ded 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972492

Change-Id: I4b908326f51817970adee878df17bad2b14c4148
 2021-06-18 17:17:22 +00: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
483b89c575 Merge changes from topic "unicorn-1" into sc-dev am: 0fcac8bf0d am: 30c3003696 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972492

Change-Id: If760363bf2408e2a8aceb6183242c14386f98e65
 2021-06-18 17:03:47 +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
30c3003696 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: I717e9492acf3f3ba054c79f0d807606e7c294e98
 2021-06-18 16:41:58 +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
611f6881a9 [automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: e774cf9cd3 -s ours am: 8fb9108c37 -s ours am: 9ee53d896a -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: Ie9b8f3fa20ee31b3dac032029037a48b9c6d7c31
 2021-06-18 12:11:10 +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
7a569a4556 Merge "Revert "Disable RecyclerView animation to fix the broken UI"" into sc-dev am: d6b3885ef5 am: 0c0bc06511 am: 5a3395ec74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016147

Change-Id: Ifb070981b909a350644c0f57162b70294185f938
 2021-06-18 11:32:27 +00:00
TreeHugger Robot
96348e0b1b Merge "Revert "Disable RecyclerView animation to fix the broken UI"" into sc-dev am: d6b3885ef5 am: 3fbade73be am: 36e5af8c6c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016147

Change-Id: Ib24a1aa337c8d8089680a369efe82f6bd7d5dfe1
 2021-06-18 11:32:02 +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
TreeHugger Robot
7e4e3abab3 Merge "Revert "Disable RecyclerView animation to fix the broken UI"" into sc-dev am: d6b3885ef5 am: d92fc0a863 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016147

Change-Id: I292a4ac13c7804f4caf060aa4ed8fb3fc3f80836
 2021-06-18 11:16:52 +00:00
TreeHugger Robot
3fbade73be Merge "Revert "Disable RecyclerView animation to fix the broken UI"" into sc-dev am: d6b3885ef5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016147

Change-Id: If71cfd75f2d09effdad8125e6b9df196343017fa
 2021-06-18 11:04:03 +00:00
TreeHugger Robot
d92fc0a863 Merge "Revert "Disable RecyclerView animation to fix the broken UI"" into sc-dev am: d6b3885ef5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016147

Change-Id: Ia5610c79ed70036c0ba4cb7d5f1439c30f317309
 2021-06-18 11:03:17 +00:00
TreeHugger Robot
0c0bc06511 Merge "Revert "Disable RecyclerView animation to fix the broken UI"" into sc-dev am: d6b3885ef5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016147

Change-Id: If8255a8b6cda0aa6c1b6c479dc68693e3c125d77
 2021-06-18 11:03:15 +00:00