Commit Graph

86056 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Jason Chang
8f432ce9ea Fix hold volume keys don't trigger the one handed mode in
One-handed mode settings page

Add to support observing A11y's Shortcut Hardware provider key
ACCESSIBILITY_SHORTCUT_TARGET_SERVICE

Bug: 193411296

Test: manual verified on System > Gestures > One-handed mode shortcut

Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures
      .OneHandedEnablePreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures
      .OneHandedMainSwitchPreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures
      .OneHandedActionPullDownPrefControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures
      .OneHandedActionShowNotificationPrefControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.OneHandedPreferenceCategoryControllerTest"

Change-Id: I4704a56873f14e52db8f7c0468eed17f190c5dce
2021-07-15 12:55:48 +00:00
SongFerng Wang
5c4fa0c4e3 Merge "Let network mode UI refresh when network type with carrier group changed" into sc-dev am: 685fedd6c2 am: 747b83b0f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15283582

Change-Id: If4476e3863c2e2425543f7bcdeda8e3861e027fc
2021-07-15 12:24:50 +00:00
SongFerng Wang
736e9dab83 Merge "Let network mode UI refresh when network type with carrier group changed" into sc-dev am: 685fedd6c2 am: 47837d28c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15283582

Change-Id: If2a42255494f95db530fd50fba80f822170cc84b
2021-07-15 12:24:30 +00:00
SongFerng Wang
47837d28c1 Merge "Let network mode UI refresh when network type with carrier group changed" into sc-dev am: 685fedd6c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15283582

Change-Id: Idf28e6e41aff03a0ce2aa16752be455794be16b7
2021-07-15 12:10:50 +00:00
SongFerng Wang
747b83b0f7 Merge "Let network mode UI refresh when network type with carrier group changed" into sc-dev am: 685fedd6c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15283582

Change-Id: I796d390e022153c77ed5ed2daf935299a9278f16
2021-07-15 12:09:56 +00:00
SongFerng Wang
685fedd6c2 Merge "Let network mode UI refresh when network type with carrier group changed" into sc-dev 2021-07-15 11:58:45 +00:00
Stanley Wang
602f59ba42 Update the illustrations of System navigation page.
- Upate 3 types of navigation illustrations.

Fix: 189426848
Test: robotest and see the UI
Change-Id: Ie56057713d528398a2e3ddad5580c6de2f60bd3f
2021-07-15 19:33:24 +08:00
menghanli
6c7b52b703 Provides TC ID for shortcut title in AccessibilityShortcutPreferenceFragment
Goal: Improve readability which is a bit difficult because of string concatenation for accurate translation.
Root cause: In some locales, framework features name would be a word rather than a product name. Hence it need to be in the different position in a sentence.
Solution: Use whole sentence to translate instead of concatenating the string could solve this issue.

Bug: 185478543
Test: Manually testing
Change-Id: Iced1fe7db81e4e78ddfed30ab947d449b5f9c735
2021-07-15 18:10:50 +08:00
TreeHugger Robot
de1a37d795 Merge "Fix the NPE issue in the Internet Settings" into sc-dev am: 381bbbda8d am: 2378b0081c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15269083

Change-Id: Ied037b5f65f6bcb0f6b9a48807c545ab0e4d5ad6
2021-07-15 09:30:08 +00:00
TreeHugger Robot
450250950d Merge "Fix the NPE issue in the Internet Settings" into sc-dev am: 381bbbda8d am: 05207bf774
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15269083

Change-Id: I9de1a21c42da0613299b5cd132c21620c80bd53c
2021-07-15 09:29:47 +00:00
TreeHugger Robot
2378b0081c Merge "Fix the NPE issue in the Internet Settings" into sc-dev am: 381bbbda8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15269083

Change-Id: I8c83ba382f7e63c2eae59906a1fc60c1a70a4946
2021-07-15 09:01:47 +00:00
TreeHugger Robot
05207bf774 Merge "Fix the NPE issue in the Internet Settings" into sc-dev am: 381bbbda8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15269083

Change-Id: I698d94ea007bea1c883040bf37ac519aa15507be
2021-07-15 09:01:33 +00:00
SongFerngWang
74a6ffaa91 Let network mode UI refresh when network type with carrier group changed
Bug: 193432269
Test: atest AllowedNetworkTypesListenerTest (pass)
atest EnabledNetworkModePreferenceControllerTest (pass)

Change-Id: Icae727887b2e913479a241bb9f014607b8ec826c
2021-07-15 16:14:41 +08:00
TreeHugger Robot
381bbbda8d Merge "Fix the NPE issue in the Internet Settings" into sc-dev 2021-07-15 06:06:56 +00:00
Bill Yi
2d6ea81b07 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4dc320540d -s ours am: ac1bcd71c5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I84b3893ff1bb7b025cd8b50fc4931a07f3d01a61
2021-07-15 03:25:27 +00:00
Bill Yi
b0c813b32d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4dc320540d -s ours am: 9604721601 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icef7c6489f9d45a2f6fcee8bc7dd4b4b9614476e
2021-07-15 03:24:59 +00:00