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

84022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Curtis Belmonte
6e416b92dc 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: Idd9cc4759d3083d4c060fd65d10ea4ceb154c199
 2021-07-19 19:55:12 +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
Stanley Wang
95b330da7d Merge "Move the illustrations of System navigation page to AOSP." into sc-dev am: de6214c442 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15328196

Change-Id: Ifcbb2823dddea66d53ab1103c21f7f33884deb17
 2021-07-19 13:50:45 +00:00
Stanley Wang
de6214c442 Merge "Move the illustrations of System navigation page to AOSP." into sc-dev 2021-07-19 13:35:04 +00:00
Edgar Wang
eff77ffd0d 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: Ie95f0de5bd7ed35c1e3494e0823dd99a00032c9b
 2021-07-19 13:11:44 +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
Stanley Wang
7756100515 Move the illustrations of System navigation page to AOSP. 
- Some devices only build with the aosp version of Settings.
  So move some related illustrations to aosp Settings.

Fix: 193932907
Test: robotest and see the UI
Change-Id: I3cd37fdf0a45fcae71b137cf3eba0f3f0442b0a5
 2021-07-19 19:58:05 +08:00
Stanley Wang
8172520329 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: I32a8dde99dbe338554f3ba9984569886174a290e
 2021-07-19 02:30:21 +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
Bill Yi
039afe7d76 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0866cb948 -s ours am: 57b189b1cd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iff02581020e064a1d321eb08c1ac2286f066d535
 2021-07-18 08:10:03 +00:00
Bill Yi
6d22e2e494 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d6bf57142a -s ours am: b34c90dc47 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I57289f87442112060cdfd468ec93dbcfe6f3b9a9
 2021-07-18 08:09:52 +00:00
Bill Yi
57b189b1cd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0866cb948 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2c4ab8ca22e13e6d8c0e84662bd5b7fbf2d45ab6
 2021-07-18 08:03:33 +00:00
Bill Yi
b34c90dc47 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d6bf57142a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I275e664e9021e0fc598ff0b682ec369e1622230e
 2021-07-18 08:02:09 +00:00
Bill Yi
aa3fd6b7f2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a57e31da59 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I929dfa95b1c38314335e05d4ec7e6950a11b937e
 2021-07-18 07:33:02 +00:00
Bill Yi
a57e31da59 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1b53832418e52ffaf1b6d784d3eac4f77ab1950a
 2021-07-17 21:04:17 +00:00
Bill Yi
d6bf57142a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3ec1d7acf840cad954ce6bb68134a4c4675fb7ab
 2021-07-17 20:51:26 +00:00
Bill Yi
d0866cb948 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I28f67cc180d5bc38770f6fa9f80bc6b8cf9852d5
 2021-07-17 20:37:34 +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
Bill Yi
deb6e762e1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f660bf994 -s ours am: 8b66811498 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iddd79a76e845a403b4ea099c1a2b2e8758a7a6b8
 2021-07-16 15:29:31 +00:00
Bill Yi
8b66811498 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f660bf994 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I27fd22e38caac8c1830c8af4f7a4c608c74b0035
 2021-07-16 15:15:54 +00:00
Bill Yi
d74db1c939 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2962edd9b0 -s ours am: aef4593a74 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6636912484fe19d521a98c18fa4e19cf48816e9a
 2021-07-16 14:59:54 +00:00
Bill Yi
aef4593a74 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2962edd9b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5ac7dc76a303bb3ce71b1b4daf19b67d4dc76eeb
 2021-07-16 14:59:40 +00:00
TreeHugger Robot
72d510e78a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 026fba52e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I42efbb54eda951275302b201b59acd6337100911
 2021-07-16 14:59:37 +00:00
TreeHugger Robot
026fba52e8 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-16 14:46:30 +00: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
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
Bill Yi
8165043546 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If9f25bb8fe9349790b04162a6d09c5ef5183e2e4
 2021-07-16 09:15:26 +00:00
Bill Yi
2962edd9b0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I601456c1a376a98531d455c0c292bf57fb696dbd
 2021-07-16 09:01:39 +00:00
Bill Yi
1f660bf994 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7e85df20c7b2befdee0d43ecbabaac82452c0249
 2021-07-16 08:46:43 +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
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
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
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
bcccb92239 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-15 21:41:51 +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
Bill Yi
0b52dfd5d1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If905d49fd63da653490a6771de1223697a2c85dc
 2021-07-15 19:56:05 +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
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
Curtis Belmonte
1b69dece94 Don't also skip fingerprint in SUW when skipping face 
Ensures that each biometric enroll intro activity handles an activity
result of RESULT_SKIP by calling the appropriate skip handler, rather
than just finishing. This fixes an issue where skipping face setup from
some Setup Wizard states would skip fingerprint setup as well.

Test: Manually skipped face setup from each screen during SUW

Bug: 193367620
Change-Id: If9ef9f19f8e967093f17dde98093a506400d7c09
 2021-07-15 09:24:23 -07:00