TreeHugger Robot
91aff5cf99
Merge "Fix hold volume keys don't trigger the one handed mode in One-handed mode settings page" into sc-v2-dev am: f761f2e15f am: 0c77283de8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297649
Change-Id: Ife7742eddb4fc4beab1b2cac33d9d6def442ec12
2021-07-19 03:50:42 +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
6e5e15e767
Merge "Fail fingerprint enroll with error if HAT is null" into sc-dev am: a18a8a1ad0 am: dc04c265a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15305557
Change-Id: I7700e0f250eb66847c58c59d890123d1c41445ba
2021-07-17 00:57:33 +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
e039077efd
Merge "Fix the problem that the SIM status and IMEI after the "Build number"."
2021-07-16 12:59:17 +00: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
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
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
9c63c415ea
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.
Bug: 193384705
Test: robotest and see the UI
Change-Id: I2de7ee72fc1315eeef01288b386f8756ca366e33
2021-07-16 19:44:25 +08: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
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
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
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
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
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
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
b0b9e6d791
Merge "Limit searchability of combined biometric Settings" into sc-dev am: cf1f67e54f am: 0f7ba3399f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15302136
Change-Id: I16619840af2a053f4b65282d4148077cb53fa2e7
2021-07-15 19:57:43 +00:00
TreeHugger Robot
bc4f16ff53
Merge "Don't also skip fingerprint in SUW when skipping face" into sc-dev am: b1ba3c57af am: 48d124bd74
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15289659
Change-Id: I5b73be074ef244f568af63a7c2977a50000c03d7
2021-07-15 19:57:22 +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