PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,552 Commits 1 Branch 0 Tags
b9841e5fd6335150bedc9748db97f62b6681de9c
Commit Graph

85552 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
fb515ed608 Add handoff activity to parental consent flow. 
Bug: 188847063
Test: manual
Change-Id: Ib6f38aae487a536fb8e85d608a22378a17c1bc64
 2021-06-18 10:35:35 -07: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
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
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
Edgar Wang
39e68c5839 Move ic_info_outline_24 from SettingsLib to Settings 
- we share info icon with FooterPreference and some widgets in Settings
  But we may update FooterPreference icon when UX guideline update, so
  we should seprate this icon from FooterPreference and Settings.

Bug: 191267392
Test: manual
Change-Id: I200b0cc4f4a04bd8950d4cac9683930a473ffe3e
 2021-06-18 10:22:58 +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
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
SongFerng Wang
efcce7f70f 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: Id7c7674718446ae42f0280d7632d7a05a7d93ebb
 2021-06-18 09:40:56 +00:00
SongFerng Wang
7e4b664df0 Merge "Add the confirmation dialog when user disable mobile data at first time" into sc-dev 2021-06-18 09:38:18 +00:00
Jason Chiu
41ead280bf Merge "Support category changed mechanism in homepage" into sc-dev am: 3ab404c6ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15008368

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

Change-Id: I380be32fc134da04e336ee2d7c9c05aad44a236c
 2021-06-18 09:34:39 +00:00
Jason Chiu
3ab404c6ba Merge "Support category changed mechanism in homepage" into sc-dev 2021-06-18 09:25:46 +00:00
TreeHugger Robot
69d3789dd8 Merge "Remove FLAG_ACTIVITY_NEW_TASK when startActivityAsUser" into sc-dev am: 86a3084cdf am: 51ec7c2a4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15008361

Change-Id: Ie5ab0a5057ddfd3036bb26e2cfc8d38432f164ce
 2021-06-18 09:04:20 +00:00
PETER LIANG
b481ecd0ea Merge "Update the Lottie images for Accessibility features." into sc-dev am: 909e3bbccf am: d412e4f1bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14999190

Change-Id: Idd05fd2e8b209831b12d2bc3c022be6014e405b3
 2021-06-18 09:02:27 +00:00
TreeHugger Robot
9b26d320f0 Merge "Remove FLAG_ACTIVITY_NEW_TASK when startActivityAsUser" into sc-dev am: 86a3084cdf am: 6c93652bad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15008361

Change-Id: Ice5b097765d119bad403e318dd2f150c196c8db4
 2021-06-18 08:57:14 +00:00
PETER LIANG
0bcad0e03d Merge "Update the Lottie images for Accessibility features." into sc-dev am: 909e3bbccf am: 5883cbebdb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14999190

Change-Id: I899056c00c74002ecea1cba94d67105362985ea4
 2021-06-18 08:57:10 +00:00