Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,995 Commits 1 Branch 0 Tags
0e328019c798d46eb967e5805b23e77410bbdae3
Commit Graph

37854 Commits

Author SHA1 Message Date
Curtis Belmonte
91ab34f189 Merge "Ensure fingerprint setup is shown once after face" into sc-dev am: 6850b70226 am: 73e12ba36e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15305975

Change-Id: I19126a96386bd3fbbe37c80ef37b8542f45f6c41
 2021-07-19 20:05:04 +00:00
Curtis Belmonte
73e12ba36e Merge "Ensure fingerprint setup is shown once after face" into sc-dev am: 6850b70226 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15305975

Change-Id: Id994e83b6361d16faf3e3761fb845a18bca886e3
 2021-07-19 19:55:57 +00:00
Curtis Belmonte
6850b70226 Merge "Ensure fingerprint setup is shown once after face" into sc-dev 2021-07-19 19:44:40 +00:00
Edgar Wang
8f552fcf64 Merge "Find the double twist sensor using the type instead of the name" into sc-dev am: 6e972e81ef am: 0eb13d6df8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15270335

Change-Id: I4e18bd5223a249eeda86834e7c1d3216ca567a3b
 2021-07-19 13:26:59 +00:00
Edgar Wang
0eb13d6df8 Merge "Find the double twist sensor using the type instead of the name" into sc-dev am: 6e972e81ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15270335

Change-Id: Ibbc0b965e9b0676cefc78570f5ec46c6bbc30330
 2021-07-19 13:12:40 +00:00
Edgar Wang
6e972e81ef Merge "Find the double twist sensor using the type instead of the name" into sc-dev 2021-07-19 12:58:43 +00:00
YUKAI HUNG
4da41e2bad Merge "Enhance battery usage refresh content log for performance testing" into sc-v2-dev am: f2cfcfbb00 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15310722

Change-Id: If8b08c3013c39cea8a2e5dfda51731bcb6b88f45
 2021-07-19 10:10:02 +00:00
YUKAI HUNG
f2cfcfbb00 Merge "Enhance battery usage refresh content log for performance testing" into sc-v2-dev 2021-07-19 09:50:07 +00:00
ykhung
8c4f097592 Enhance battery usage refresh content log for performance testing 
Fixes: 194021631
Test: make SettingsRoboTests
Change-Id: If013befb7a9aaf590762cec10035269e66588ab7
 2021-07-19 04:58:10 +00:00
TreeHugger Robot
0c77283de8 Merge "Fix hold volume keys don't trigger the one handed mode in One-handed mode settings page" into sc-v2-dev am: f761f2e15f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297649

Change-Id: I902d5322c7cdbe22c4f57d1efa24795b5c7eb6f4
 2021-07-19 03:31:10 +00:00
TreeHugger Robot
f761f2e15f Merge "Fix hold volume keys don't trigger the one handed mode in One-handed mode settings page" into sc-v2-dev 2021-07-19 03:23:57 +00:00
Stanley Wang
2ffb606759 Merge "Fix the problem that the SIM status and IMEI after the "Build number"." into sc-dev am: 2ea54cc143 am: 8f5c440f4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15270337

Change-Id: I0014a0bc7b4e07628b03c88c411d95fbc469268b
 2021-07-19 02:41:28 +00:00
Stanley Wang
8f5c440f4b Merge "Fix the problem that the SIM status and IMEI after the "Build number"." into sc-dev am: 2ea54cc143 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15270337

Change-Id: Ia58371ef266b745efda8d896bd3283ca56ca95a9
 2021-07-19 02:31:04 +00:00
Stanley Wang
2ea54cc143 Merge "Fix the problem that the SIM status and IMEI after the "Build number"." into sc-dev 2021-07-19 02:10:21 +00:00
Curtis Belmonte
61d7968390 Merge "Fail fingerprint enroll with error if HAT is null" into sc-dev am: a18a8a1ad0 am: 8d443bdebd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15305557

Change-Id: I581b985435d2c53aca8558bdea1ce148f263e85f
 2021-07-17 00:57:21 +00:00
Curtis Belmonte
fa4d019839 Merge "Fail fingerprint enroll with error if HAT is null" into sc-dev am: a18a8a1ad0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15305557

Change-Id: I8e42f13d6127890ffbb32c756c8d33b3c87366c2
 2021-07-17 00:52:49 +00:00
Curtis Belmonte
8d443bdebd Merge "Fail fingerprint enroll with error if HAT is null" into sc-dev am: a18a8a1ad0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15305557

Change-Id: I73dd8540c975cdb535a5c0f008d98ecfcf4b23ac
 2021-07-17 00:51:02 +00:00
Curtis Belmonte
a18a8a1ad0 Merge "Fail fingerprint enroll with error if HAT is null" into sc-dev 2021-07-17 00:47:14 +00:00
Curtis Belmonte
c6ced3fb21 Fail fingerprint enroll with error if HAT is null 
Fingerprint enroll expects a non-null HAT. If we don't have one, rather
than crashing or stalling out enrollment, fail fast with an error.

Test: Manual

Bug: 193811614
Change-Id: Ifb791e19430e33cb82566e4916ab1a7b997b32ff
 2021-07-16 14:35:25 -07:00
Stanley Wang
1fcdafbcda Fix the problem that the SIM status and IMEI after the "Build number". 
- Adding the SIM status and IMEI items of SIM2 to the PreferenceScreen
  can not put these items in the correct categories. We have to put
  these items directly into the correct categories.

Fix: 193384705
Test: robotest and see the UI

Merged-In: I2de7ee72fc1315eeef01288b386f8756ca366e33
Change-Id: I9472ecd604afe2f2e2eaf08c92ec11e439e8fc1d
 2021-07-16 22:03:54 +08:00
Stanley Wang
89f82c126b Merge "Update the illustrations of System navigation page." into sc-dev am: c916876cc7 am: 21a148d9fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297631

Change-Id: Id188157c1f68ff6227458ff6771910ecd40d4cae
 2021-07-16 12:15:12 +00:00
Stanley Wang
21a148d9fe 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: Ifdc3f6d19e74290c2ff6ccb037590861627d6f5e
 2021-07-16 11:55:24 +00:00
Stanley Wang
69a9d7aa11 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: I287a6788e9ff460ab58a1c61e019be0cf37480a6
 2021-07-16 11:54:13 +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
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
Edgar Wang
8fc818709d Find the double twist sensor using the type instead of the name 
Bug: 192565190
Test: manual & robotest
Change-Id: Ib2b4b39f75667700c503b49f114887a61f7603a6
 2021-07-16 04:12:41 +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
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
Curtis Belmonte
b61478c30c Ensure fingerprint setup is shown once after face 
Adds an activity result extra during multi-biometric enroll that
ensures fingerprint setup will not be repeated multiple times if
explicitly finished or skipped by the user. Also updates various
activities in the stack to ensure that they handle all possible result
codes correctly and pass along result data.

Test: Manually skip and complete at each stage of multi-biometric enroll
Test: Manually test single-biometric enroll flows for SUW and Settings

Fixes: 193601823
Change-Id: Ic5a8306068eb4c32009f146ad6fff824fde25a11
 2021-07-15 17:00:43 -07: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
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
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
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
4aa06d7639 Merge "Use correct choose lock password/pattern subtitles" into sc-dev 2021-07-15 20:14:32 +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
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
TreeHugger Robot
caa670fad4 Merge "Disable the mic/cam toggles when admin disallows" into sc-dev 2021-07-15 19:52:50 +00:00
TreeHugger Robot
dca7bb5d4d Merge "Limit searchability of combined biometric Settings" into sc-dev am: cf1f67e54f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15302136

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

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

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

Change-Id: I2654f712d818faca6d04f6394bfe4aae72a06844
 2021-07-15 19:42:44 +00:00
TreeHugger Robot
cf1f67e54f Merge "Limit searchability of combined biometric Settings" into sc-dev 2021-07-15 19:21:56 +00:00
TreeHugger Robot
b1ba3c57af Merge "Don't also skip fingerprint in SUW when skipping face" into sc-dev 2021-07-15 19:17:07 +00:00
Curtis Belmonte
a8d7fb68ca Use correct choose lock password/pattern subtitles 
Ensures that the existing subtitle strings for the choose lock
password/pattern screens are shown during SUW and from Settings.

Test: Manually tested PIN/pattern/password in SUW and Settings

Fixes: 193802664
Change-Id: Ibbb5f0c7bcd3885e63c02d8b68cd3205ffb529fd
 2021-07-15 11:35:07 -07:00
Curtis Belmonte
effa67a8bb Limit searchability of combined biometric Settings 
Ensures that the combined biometric settings pages shown in Settings are
not indexed for search on devices without multiple biometric sensors.

Test: Manually tested on devices with and without multiple biometrics

Fixes: 193704179
Change-Id: I007b5d2a0191cb61454e5ae0f411d4c594536fc5
 2021-07-15 10:51:35 -07:00