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

89551 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
TreeHugger Robot
d6b3885ef5 Merge "Revert "Disable RecyclerView animation to fix the broken UI"" into sc-dev 2021-06-18 10:45:20 +00:00
Yi-Ling Chuang
357b08a63e Revert "Disable RecyclerView animation to fix the broken UI" 
This reverts commit 5b219a34ab.

Reason for revert: <b/191335572>

Bug: 191335572
Change-Id: I47ceb8d043e3b02a59e43a1ae021c3c7855cbe57
 2021-06-18 10:45:13 +00:00
Automerger Merge Worker
5f05ecffcd Merge "Merge "Add the confirmation dialog when user disable mobile data at first time" into sc-dev am: 7e4b664df0 am: 3bfb649c29 am: 0117964ae2" 2021-06-18 10:03:17 +00:00
SongFerng Wang
0176324e79 Merge "Add the confirmation dialog when user disable mobile data at first time" into sc-dev am: 7e4b664df0 am: 3bfb649c29 am: 0117964ae2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001650

Change-Id: Id4b02c288e82eb10b387abae13b9c2637ee9aa52
 2021-06-18 10:03:14 +00:00
SongFerng Wang
01c6edf2ef Merge "Add the confirmation dialog when user disable mobile data at first time" into sc-dev am: 7e4b664df0 am: 952e1e83d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001650

Change-Id: I4d42bc318bacc7c4bc1ba03efcfd7841177caacb
 2021-06-18 10:03:13 +00:00
SongFerng Wang
0117964ae2 Merge "Add the confirmation dialog when user disable mobile data at first time" into sc-dev am: 7e4b664df0 am: 3bfb649c29 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001650

Change-Id: Iab86f12a981d5779e71bb91aef0bad578f93ee45
 2021-06-18 09:59:28 +00:00
SongFerng Wang
90602b73d1 Merge "Add the confirmation dialog when user disable mobile data at first time" into sc-dev am: 7e4b664df0 am: efcce7f70f am: 001395533a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001650

Change-Id: I698df31c58cf3e545b53a48da5225dd2bc703925
 2021-06-18 09:59:07 +00:00
Jason Chiu
6525cb577e Merge "Support category changed mechanism in homepage" into sc-dev am: 3ab404c6ba am: 41ead280bf am: 8baa79302f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15008368

Change-Id: If3cbddf4de8f0a3cec0ca63e136c62e8531443d3
 2021-06-18 09:59:01 +00:00
Jason Chiu
a3d47f1629 Merge "Support category changed mechanism in homepage" into sc-dev am: 3ab404c6ba am: 36fca1dc05 am: 8de7ebb3af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15008368

Change-Id: I456071ca84ab550e5e722f3ed7b50e52259aaa47
 2021-06-18 09:58:50 +00:00
SongFerng Wang
952e1e83d9 Merge "Add the confirmation dialog when user disable mobile data at first time" into sc-dev am: 7e4b664df0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001650

Change-Id: I52d174530009f6f90fb15d4348291f2a6311fcd5
 2021-06-18 09:50:52 +00:00
SongFerng Wang
001395533a Merge "Add the confirmation dialog when user disable mobile data at first time" into sc-dev am: 7e4b664df0 am: efcce7f70f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001650

Change-Id: I53b5181da7fb682b00ad628b5df0b4e71d13a64f
 2021-06-18 09:49:55 +00:00
Jason Chiu
8baa79302f Merge "Support category changed mechanism in homepage" into sc-dev am: 3ab404c6ba am: 41ead280bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15008368

Change-Id: Ic1997cd8a692b0fcc3e49b3a13d723eda6eabb17
 2021-06-18 09:49:50 +00:00
SongFerng Wang
3bfb649c29 Merge "Add the confirmation dialog when user disable mobile data at first time" into sc-dev am: 7e4b664df0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001650

Change-Id: I572b167d39ebce9442821578c048ad6c9ddb5b06
 2021-06-18 09:49:10 +00:00
Jason Chiu
8de7ebb3af Merge "Support category changed mechanism in homepage" into sc-dev am: 3ab404c6ba am: 36fca1dc05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15008368

Change-Id: I25f71f7147bceed23612d283dbb204ae5989fd2f
 2021-06-18 09:45:47 +00:00