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
TreeHugger Robot
4f103d76f8
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2021-07-18 07:42:43 +00:00
Bill Yi
0488d9d61d
[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: If00eb6ea4b437adc1ff8f4902419cbfdb65f152d
2021-07-18 07:32:52 +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
67fee1eadc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5bdf169c9dfcf65379e55ec087c8f4dd9724dcb1
2021-07-17 20:41:09 +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
dc04c265a2
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: If1680e7b6bf4836ad94d668fafceda85e5738c8a
2021-07-17 00:51:00 +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
cbcf7932c7
[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: Ib9fc4cd8b7d27c93cf0e2f6f57ade9a305be40fd
2021-07-16 15:29:35 +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
728315f696
[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: Ic88e2a9fddd1a07d7be96483e426310635dfa16c
2021-07-16 15:05:30 +00:00
TreeHugger Robot
a0cee9f717
[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: I756d81a8f8f7302cbde9d9e207fd27c9476b4b79
2021-07-16 14:59:41 +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
1a87f6494f
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2021-07-16 14:52:22 +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
c7459e9ec1
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: Idb8abbe0559f777a01923ada2b79f55fe7213c2b
2021-07-16 11:54:38 +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
783ad2b74e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I19360b0a8f018f68de38dc04be164ab789c38e29
2021-07-16 08:50:32 +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
Wesley.CW Wang
7e9fdf69a4
Update dark theme battery info error text color
...
screenshot: https://screenshot.googleplex.com/8UyMj5q7tLJ2uA8.png
Bug: 187611525
Test: make SettingsRoboTests
Change-Id: Iefec51d9ca6d27c9173af0756301f4278e928433
2021-07-16 14:17:46 +08: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
b65c1ace04
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: I4212b8bd1f7f72bf22c17af38d16b1a5716b21e2
2021-07-15 22:54:21 +00:00
Beth Thibodeau
20e57d33ff
Merge "Remove lockdown toggle" into sc-dev
2021-07-15 22:44:24 +00:00
TreeHugger Robot
4d37f8d642
[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: Ia41620c6e235e7030da0669758fb30d72c80c4f8
2021-07-15 21:56:19 +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
3bc99cf4b4
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: I033b3ef19d707b2c3f9767cc3459349b94a21697
2021-07-15 20:34:43 +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
4c20c4de7f
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: I92e645137e5251d6635f6edb9a69165fe626271c
2021-07-15 20:06:03 +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
0f7ba3399f
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: I3740cb6b2e9759046c1b91637b2e6b72d36216db
2021-07-15 19:42:59 +00:00
TreeHugger Robot
48d124bd74
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: I902d512426449773c3870114237bc3c0c054a2d4
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
1ddb70fec9
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: I8771eea133e8d4608ab607b049f506e7a96a960c
2021-07-15 12:10:00 +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
TreeHugger Robot
c80050cede
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: I8140bf98906941a0ada1910dacc8bbe6123bd17f
2021-07-15 09:00:31 +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
61c84d5ba1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4dc320540d
-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: I635ab4766529b602f4d52c3c3cd005862837e4e4
2021-07-15 01:14:48 +00:00