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

84040 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
c9887edbb2 Merge "Remove the duplicated skip lock screen setting" into sc-dev am: b5b519dd85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928755

Change-Id: I608b43e73d04da0f15640fc3b7ce9406e83a3dde
 2021-06-21 08:08:18 +00:00
TreeHugger Robot
b5b519dd85 Merge "Remove the duplicated skip lock screen setting" into sc-dev 2021-06-21 07:54:30 +00:00
TreeHugger Robot
ea0673a482 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: d768d1b3b1 -s ours am: 058027f470 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I94f129d38674ea2657f8f5d65bb87d3a15d0021d
 2021-06-20 18:28:09 +00:00
Bill Yi
d9fd5449d9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1e77e7c1f -s ours am: 9620fa8249 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id6a407b2a04954e646a4d632d7f25f4a90712e5f
 2021-06-20 18:27:51 +00:00
TreeHugger Robot
058027f470 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: d768d1b3b1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I86a655610ea394d6612d2b4dea7dee83ed08edc1
 2021-06-20 18:23:41 +00:00
Bill Yi
9620fa8249 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1e77e7c1f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0208233adf22b2cf01a19ae1c4d197a99f2090e6
 2021-06-20 18:23:31 +00:00
TreeHugger Robot
576e89d615 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e17516456f -s ours am: 64ab66344d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7bae221a987e02e2cf09c6dea184b8e0b6b162e4
 2021-06-20 18:23:24 +00:00
Bill Yi
327e1a7fbd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 690868f6ec -s ours am: b9a47c348f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5b23c1d90395d443efa75437d337317f719f2c2e
 2021-06-20 18:23:18 +00:00
TreeHugger Robot
6698bf6b03 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fc2e32ecc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia7ef72cbf2a3ae85d1bd4ab86b5eb43fd09b8455
 2021-06-20 18:23:11 +00:00
Bill Yi
3bc187fdf9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 00bfaf371a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I848d48ea70fbd8a715beef444492ec118aeb3077
 2021-06-20 18:23:04 +00:00
TreeHugger Robot
d768d1b3b1 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-20 18:11:44 +00:00
TreeHugger Robot
a8400bb566 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-06-20 18:10:33 +00:00
TreeHugger Robot
64ab66344d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e17516456f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I34013563e522a7f1db4b967d4ebca58713d33752
 2021-06-20 18:01:02 +00:00
Bill Yi
b9a47c348f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 690868f6ec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6e000079fb1073019825a891eb642f9ec476d3e3
 2021-06-20 18:00:52 +00:00
TreeHugger Robot
0fc2e32ecc Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-20 17:58:33 +00:00
TreeHugger Robot
e17516456f Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-20 17:56:15 +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
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
b2c157906c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib63cebb1228a36e93dddc5d64d4f2ab8a8c72d1d
 2021-06-20 10:25:05 +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
5a8966882e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I591d43dee61e9bb80649ee0cef6a44509e86eabd
 2021-06-20 10:18:14 +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
2a56378bfc [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: Iabe9a532586fd94d5bbb74aae242b98a406d4e30
 2021-06-20 01:30:17 +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
60462e3dbf [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: I5ed93a46b4578bf9b13c5af118aaf45dbe75309a
 2021-06-20 01:25:34 +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
TreeHugger Robot
647ec500dc Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-06-20 00:58:51 +00:00
Bill Yi
ef8657eb2b [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: I9ac48876efc5f2f0528e374309e855903a0429e0
 2021-06-20 00:58:01 +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
97e54327d7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9a1f29b0eb5b384c3028e3965a87a98026b5a696
 2021-06-19 20:59:02 +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
Bill Yi
7be3fbc056 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5f0580a549dc86e694219b78552c027f16a7d978
 2021-06-19 20:52:00 +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
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
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
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
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
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