TreeHugger Robot
f97a194881
Merge "Update dark theme battery info error text color" into sc-dev am: 501a4cea3b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15308397
Change-Id: I4df788647ce68c6043b876345d4753f7fbae6555
2021-07-21 10:57:00 +00:00
TreeHugger Robot
501a4cea3b
Merge "Update dark theme battery info error text color" into sc-dev
2021-07-21 10:47:56 +00:00
TreeHugger Robot
edd603ce9b
Merge "Add logs for tracking Slice provider startup" into sc-dev am: 623d86d121
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15334936
Change-Id: I6ede3c1673a156b50af9c9d2644448ae22c711ba
2021-07-21 05:06:49 +00:00
TreeHugger Robot
623d86d121
Merge "Add logs for tracking Slice provider startup" into sc-dev
2021-07-21 04:52:23 +00:00
Jason Chiu
f0248e096e
Add logs for tracking Slice provider startup
...
Bug: 191555397
Test: build, manual
Change-Id: Ic95fb0a7a8ba30f7802111a7a453fb73f4c918fe
2021-07-21 03:48:03 +00:00
Curtis Belmonte
848c5817dc
Move multi-biometric logic to base fp intro activity am: 0a8916a808
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15339693
Change-Id: I5ff75c167d643bea4758c05a919e629cf3766ab7
2021-07-21 00:35:13 +00:00
Curtis Belmonte
0a8916a808
Move multi-biometric logic to base fp intro activity
...
Ensures that the relevant multi-biometric logic--specifically, logic to
ensure that fingerprint enroll is shown exactly once after face
enroll--is present in both the SUW and non-SUW versions of the
fingerprint enroll introduction activity. This fixes an issue where
fingerprint enroll would occur multiple times when triggering the
multi-biometric enroll flow outside of SUW (e.g. via an enroll intent
action).
Test: CTS-Verifier: Biometric Tests > 2a: Strong Biometrics + Crypto
Bug: 193601823
Change-Id: I17c09e9a72ced2f23b0b279ea51a6aa209668485
2021-07-20 13:32:13 -07:00
Bill Yi
7618582a91
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 153dfb568e
-s ours am: 0e35466c36
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15332046
Change-Id: I1c097011db0fd587e05d12d5a960309060663cf1
2021-07-20 14:42:20 +00:00
Bill Yi
0e35466c36
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 153dfb568e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15332046
Change-Id: I7babb2555148761af2e6024037d6b8f93e997a76
2021-07-20 14:29:41 +00:00
Bill Yi
58eef7be7e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 08145cc2ec
-s ours am: f74a3499b1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15331689
Change-Id: Ia3b0a83420cd1184491f68cfc5e1dd5f63e08f27
2021-07-20 14:19:38 +00:00
Bill Yi
abc709ef10
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d5ded6d0fa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15337151
Change-Id: Id5f6cd34d84d9a671b1aaa2737c1f3449cc7cba2
2021-07-20 14:19:34 +00:00
Bill Yi
f74a3499b1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 08145cc2ec
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15331689
Change-Id: Ia26623b3afa06627c6f8e8930667777bc41896d0
2021-07-20 14:15:38 +00:00
Bill Yi
d5ded6d0fa
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib2bfb253a81bc12d86ddf3fb31823f79d2f23170
2021-07-20 11:07:44 +00:00
Bill Yi
08145cc2ec
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id9f883b7546c1dd90e528496b764cef120303a1a
2021-07-20 10:54:19 +00:00
Bill Yi
153dfb568e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2720761609d383628078cd0f2a15f4d0f76917b4
2021-07-20 10:39:54 +00:00
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
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