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
Bill Yi
165a3c9880
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I162d0b3f065d8dd902a251aa847c4367b1dc1767
2021-07-16 09:19:39 +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
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
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
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
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