PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,239 Commits 1 Branch 0 Tags
12fd312660ea1d5015fb06ee4a4d0097ec50a76c
Commit Graph

92239 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stanley Wang
12fd312660 Merge "Update the illustrations of System navigation page." into sc-dev am: c916876cc7 am: c7459e9ec1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297631

Change-Id: Ia7089bb61f85cbddd08f21da37f1f37cacb8904e
 2021-07-16 12:14:47 +00:00
Stanley Wang
c7459e9ec1 Merge "Update the illustrations of System navigation page." into sc-dev am: c916876cc7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297631

Change-Id: Idb8abbe0559f777a01923ada2b79f55fe7213c2b
 2021-07-16 11:54:38 +00:00
Stanley Wang
c916876cc7 Merge "Update the illustrations of System navigation page." into sc-dev 2021-07-16 11:37:51 +00:00
Menghan Li
5cdaaed04c Merge "Provides TC ID for shortcut title in AccessibilityShortcutPreferenceFragment" into sc-v2-dev am: 77b8431156 am: 7c011ae5c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297637

Change-Id: Ib1bbfc97929be4de656a70e1afa0e353c5ac6c88
 2021-07-16 06:20:43 +00:00
Menghan Li
7c011ae5c0 Merge "Provides TC ID for shortcut title in AccessibilityShortcutPreferenceFragment" into sc-v2-dev am: 77b8431156 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297637

Change-Id: I81c5f633fb3c1f94056136777fab23b0ab97d6eb
 2021-07-16 06:08:25 +00:00
Menghan Li
77b8431156 Merge "Provides TC ID for shortcut title in AccessibilityShortcutPreferenceFragment" into sc-v2-dev 2021-07-16 05:54:31 +00:00
Beth Thibodeau
1eddd35553 Merge "Remove lockdown toggle" into sc-dev am: 20e57d33ff am: fb3af25ce1 am: 8e65092ee9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15290234

Change-Id: Ie74e3f63f2fdc1a8bb4ea9913df5d2d2381a333f
 2021-07-16 02:38:06 +00:00
TreeHugger Robot
5334c472ac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bcccb92239 -s ours am: cdfe31e4cf -s ours am: 91e57d79fc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9e79a8eb09f21664a019cac811989395be76a9e3
 2021-07-16 02:36:47 +00:00
Curtis Belmonte
4948cd3466 Merge "Use correct choose lock password/pattern subtitles" into sc-dev am: 4aa06d7639 am: 0378dfff5a am: 88b1052394 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15302650

Change-Id: I9b02755395575cca8b383ee55d245dbb373fe641
 2021-07-16 02:36:42 +00:00
TreeHugger Robot
5bdccf5f6e Merge "Disable the mic/cam toggles when admin disallows" into sc-dev am: caa670fad4 am: e36357fd71 am: 8ce3b2f8a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15089520

Change-Id: I49f87a8101df08e6f231fad1e1b8d0db49b0d39d
 2021-07-16 02:36:10 +00:00
Beth Thibodeau
8e65092ee9 Merge "Remove lockdown toggle" into sc-dev am: 20e57d33ff am: fb3af25ce1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15290234

Change-Id: I7978ec3a1686df7594431b9f413bda6b53f3916e
 2021-07-16 02:15:18 +00:00
TreeHugger Robot
91e57d79fc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bcccb92239 -s ours am: cdfe31e4cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie64f39a579a8627236b2d9214ae67aed3309ef15
 2021-07-16 02:13:40 +00:00
Curtis Belmonte
88b1052394 Merge "Use correct choose lock password/pattern subtitles" into sc-dev am: 4aa06d7639 am: 0378dfff5a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15302650

Change-Id: Ieb4335ffb95f59aab3ade0eea6860448e2e23382
 2021-07-16 02:13:37 +00:00
TreeHugger Robot
8ce3b2f8a1 Merge "Disable the mic/cam toggles when admin disallows" into sc-dev am: caa670fad4 am: e36357fd71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15089520

Change-Id: I532b3f44ad90e21b8f4fa7a302ee78bcba0b9688
 2021-07-16 02:13:25 +00:00
Beth Thibodeau
fb3af25ce1 Merge "Remove lockdown toggle" into sc-dev am: 20e57d33ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15290234

Change-Id: I004edf20fb3ecbc7f169a0105516f78cc542f841
 2021-07-16 02:01:22 +00:00
TreeHugger Robot
cdfe31e4cf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bcccb92239 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3512f7dcfdcaa905af33add6a6d16b752b2b3abd
 2021-07-16 01:58:22 +00:00
Curtis Belmonte
0378dfff5a Merge "Use correct choose lock password/pattern subtitles" into sc-dev am: 4aa06d7639 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15302650

Change-Id: I86852d25a8fb258ba8ffbbe594f2ce04780e40cb
 2021-07-16 01:58:16 +00:00
TreeHugger Robot
e36357fd71 Merge "Disable the mic/cam toggles when admin disallows" into sc-dev am: caa670fad4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15089520

Change-Id: I044f2cb21d3816e0e46cfde468421ddf56c6bebb
 2021-07-16 01:58:08 +00:00
Beth Thibodeau
465b1caed3 Merge "Remove lockdown toggle" into sc-dev am: 20e57d33ff am: 97b8a6409d am: f77c705e4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15290234

Change-Id: I0cdb23d4d27eaa727d2455dead7474f13116e685
 2021-07-15 23:32:25 +00:00
Beth Thibodeau
f77c705e4b Merge "Remove lockdown toggle" into sc-dev am: 20e57d33ff am: 97b8a6409d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15290234

Change-Id: I0770404823036e30f4e38cf8ff298b90d78e34a6
 2021-07-15 23:10:52 +00:00
Beth Thibodeau
3ebe4c9bc2 Merge "Remove lockdown toggle" into sc-dev am: 20e57d33ff am: b65c1ace04 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15290234

Change-Id: I06c80d5f42986bdb6b2dd7818570e4f8eb4e1066
 2021-07-15 23:10:12 +00:00
Beth Thibodeau
b65c1ace04 Merge "Remove lockdown toggle" into sc-dev am: 20e57d33ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15290234

Change-Id: I4212b8bd1f7f72bf22c17af38d16b1a5716b21e2
 2021-07-15 22:54:21 +00:00
Beth Thibodeau
97b8a6409d Merge "Remove lockdown toggle" into sc-dev am: 20e57d33ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15290234

Change-Id: I49989ad03fa694d188865a9d13a0cf9b0c58134a
 2021-07-15 22:54:20 +00:00
Beth Thibodeau
20e57d33ff Merge "Remove lockdown toggle" into sc-dev 2021-07-15 22:44:24 +00:00
TreeHugger Robot
d9ce23072d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bcccb92239 -s ours am: 246951b84e -s ours am: 40e622d440 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idde52955cece7668541baefc38e4421707afac9c
 2021-07-15 22:20:09 +00:00
Automerger Merge Worker
eb09a47f48 Merge "Merge "Use correct choose lock password/pattern subtitles" into sc-dev am: 4aa06d7639 am: ec4d101cac am: ce924dc3fc" 2021-07-15 22:20:06 +00:00
TreeHugger Robot
cf0b4db06c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bcccb92239 -s ours am: 4d37f8d642 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I290e29054132d2037074e45f62f59e5aeba9a441
 2021-07-15 22:20:02 +00:00
Curtis Belmonte
bba3dce4cd Merge "Use correct choose lock password/pattern subtitles" into sc-dev am: 4aa06d7639 am: ec4d101cac am: ce924dc3fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15302650

Change-Id: I285fe94b060dd20e64e368e5d4dca0aa00bdc35d
 2021-07-15 22:20:02 +00:00
TreeHugger Robot
40dd1aa25e Merge "Disable the mic/cam toggles when admin disallows" into sc-dev am: caa670fad4 am: c100eb4e32 am: 69be0fa6bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15089520

Change-Id: Iccf950bc6175f441430087a33e0dc2f8e785fd7b
 2021-07-15 22:11:20 +00:00
TreeHugger Robot
40e622d440 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bcccb92239 -s ours am: 246951b84e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia15b379ed176be672685e97faf15e2ed9504e5f1
 2021-07-15 22:06:36 +00:00
Curtis Belmonte
ce924dc3fc Merge "Use correct choose lock password/pattern subtitles" into sc-dev am: 4aa06d7639 am: ec4d101cac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15302650

Change-Id: Id26731218e7cfdef409dbebb55a95396a71761c8
 2021-07-15 22:06:02 +00:00
TreeHugger Robot
69be0fa6bf Merge "Disable the mic/cam toggles when admin disallows" into sc-dev am: caa670fad4 am: c100eb4e32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15089520

Change-Id: Ifcfdbddceb1e6ed12291f87f2845d46988c7b525
 2021-07-15 22:05:53 +00:00
TreeHugger Robot
246951b84e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bcccb92239 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iee8ff1a157bb03c32d93a1a9605e1512460bc61a
 2021-07-15 21:57:01 +00:00
TreeHugger Robot
4d37f8d642 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bcccb92239 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia41620c6e235e7030da0669758fb30d72c80c4f8
 2021-07-15 21:56:19 +00:00
TreeHugger Robot
bcccb92239 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-15 21:41:51 +00:00
Curtis Belmonte
72bc74c98c Merge "Use correct choose lock password/pattern subtitles" into sc-dev am: 4aa06d7639 am: 3bc99cf4b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15302650

Change-Id: I4acfaa2cf2b7c23bd74401608030fa0914ba995b
 2021-07-15 20:54:37 +00:00
Curtis Belmonte
ec4d101cac Merge "Use correct choose lock password/pattern subtitles" into sc-dev am: 4aa06d7639 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15302650

Change-Id: I9af50c27cafa4d809265607833c536816a1a3b35
 2021-07-15 20:35:03 +00:00
Curtis Belmonte
3bc99cf4b4 Merge "Use correct choose lock password/pattern subtitles" into sc-dev am: 4aa06d7639 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15302650

Change-Id: I033b3ef19d707b2c3f9767cc3459349b94a21697
 2021-07-15 20:34:43 +00:00
TreeHugger Robot
288f1462fa Merge "Disable the mic/cam toggles when admin disallows" into sc-dev am: caa670fad4 am: 4c20c4de7f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15089520

Change-Id: Ifd2599132622527d0dba47cae2245a02a64622f0
 2021-07-15 20:20:17 +00:00
Curtis Belmonte
4aa06d7639 Merge "Use correct choose lock password/pattern subtitles" into sc-dev 2021-07-15 20:14:32 +00:00
TreeHugger Robot
c8767c67a5 Merge "Limit searchability of combined biometric Settings" into sc-dev am: cf1f67e54f am: 609304e6bc am: 4c63d4aade 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15302136

Change-Id: I18826b5242a96a1fcdcc18c2ba74cb438489b777
 2021-07-15 20:11:10 +00:00
TreeHugger Robot
58f8a147c9 Merge "Don't also skip fingerprint in SUW when skipping face" into sc-dev am: b1ba3c57af am: f45af993e5 am: 17bfa65e48 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15289659

Change-Id: I73ff7ad43e09517722f57986d77ab0b05f96676c
 2021-07-15 20:11:04 +00:00
TreeHugger Robot
7349fb5a20 Merge "Limit searchability of combined biometric Settings" into sc-dev am: cf1f67e54f am: dca7bb5d4d am: c3aae8bcdf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15302136

Change-Id: Idde4522bf9dd62b69a55069a84d12d383b3d131f
 2021-07-15 20:10:55 +00:00
TreeHugger Robot
0eb6a2cb77 Merge "Don't also skip fingerprint in SUW when skipping face" into sc-dev am: b1ba3c57af am: 205a6088a8 am: 2603ad8e04 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15289659

Change-Id: I373a8dc2878225aacba537278456b10fd194561d
 2021-07-15 20:10:27 +00:00
TreeHugger Robot
4c20c4de7f Merge "Disable the mic/cam toggles when admin disallows" into sc-dev am: caa670fad4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15089520

Change-Id: I92e645137e5251d6635f6edb9a69165fe626271c
 2021-07-15 20:06:03 +00:00
TreeHugger Robot
c100eb4e32 Merge "Disable the mic/cam toggles when admin disallows" into sc-dev am: caa670fad4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15089520

Change-Id: I4d26a22136ef98071de7f36f1d836e902c2aae85
 2021-07-15 20:05:56 +00:00
TreeHugger Robot
4c63d4aade Merge "Limit searchability of combined biometric Settings" into sc-dev am: cf1f67e54f am: 609304e6bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15302136

Change-Id: I4ebdd47774eb05f354b909a1ae9e08f75f81215b
 2021-07-15 19:58:36 +00:00
TreeHugger Robot
17bfa65e48 Merge "Don't also skip fingerprint in SUW when skipping face" into sc-dev am: b1ba3c57af am: f45af993e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15289659

Change-Id: I2bf944568ee29b989cb89e8d630185bc09e89325
 2021-07-15 19:58:30 +00:00
TreeHugger Robot
c3aae8bcdf Merge "Limit searchability of combined biometric Settings" into sc-dev am: cf1f67e54f am: dca7bb5d4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15302136

Change-Id: I6149ef3fcf34d5bbf474cab29611ebb02a83f8f8
 2021-07-15 19:58:02 +00:00
TreeHugger Robot
2603ad8e04 Merge "Don't also skip fingerprint in SUW when skipping face" into sc-dev am: b1ba3c57af am: 205a6088a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15289659

Change-Id: Ifac150920895adcf0794eb0c28d2ccb97953ef2c
 2021-07-15 19:57:51 +00:00