YUKAI HUNG
7ddd37c117
Merge "Enhance battery usage refresh content log for performance testing" into sc-dev am: a1b5fbc89c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15343067
Change-Id: I9436d6d339a96aef07b5050e291f5adfffc76b20
2021-07-21 11:15:03 +00:00
YUKAI HUNG
a1b5fbc89c
Merge "Enhance battery usage refresh content log for performance testing" into sc-dev
2021-07-21 11:02:33 +00:00
TreeHugger Robot
7dab391b1c
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: Ifff82969ab6776ee7f6d24951fd55173fa729c2a
2021-07-21 10:58:34 +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
ykhung
512fcfc73b
Enhance battery usage refresh content log for performance testing
...
Fixes: 194021631
Test: make SettingsRoboTests
Change-Id: If013befb7a9aaf590762cec10035269e66588ab7
(cherry picked from commit 8c4f097592
)
2021-07-21 09:41:19 +00:00
ykhung
09e1164c0c
Remove items from not allowed show summary list (legacy rule)
...
Bug: 191991503
Test: make SettingsRoboTests
Change-Id: Ieadc97eddcbd149e04ec85477859a9b3ffd8f06b
(cherry picked from commit b6d95d1c4f
)
2021-07-21 09:40:30 +00:00
ykhung
26af50c21e
Include new "dex2oat64" process to map into App Optimization name
...
Bug: 191991503
Test: make SettingsRoboTests
Change-Id: Ib392ed3adf7fe37fdaf73076dd1c3cd8361468eb
(cherry picked from commit d76c12f69c
)
2021-07-21 09:39:12 +00:00
TreeHugger Robot
e690a351ae
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: I7ce45fa8c81f8e702513ad8d52e082923568a68f
2021-07-21 05:07:12 +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
3ade9189c9
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: I3aba618b12d86415a5fcd845ef49e244a7dc0a33
2021-07-21 00:35:17 +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
771f1046d7
[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: Iffc277cf8138f3e5df97aa68bde03637b9a61c51
2021-07-20 14:43:01 +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
4730a79de2
[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: I9b38cce2fb4a310d2ba5ae23af5f8e6471ba7408
2021-07-20 14:19:45 +00:00
Bill Yi
426731721c
[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: I081fd28a25c3b4d5918064e0fcbba3eb59078c8d
2021-07-20 14:19:37 +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
89c2067a75
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I00cd800058e0a4e32651b7ff5744f2d9963dfb36
2021-07-20 10:43:35 +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
52cdfa0e15
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: Ibf8864bdb3e8d050baa98d88728a4a6551f6a6d2
2021-07-19 19:55:10 +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
192d9d9689
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: I006450b141093ccd203dd1bb1e6278e7708a90dd
2021-07-19 13:51:04 +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
298bf4382c
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: Ie6a26bda79c7d7e7a3785f882062d3b1106520e6
2021-07-19 13:11:46 +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
cf87fb2ae6
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: Id106769c16e75e8b0c838b6f3ec847384c8ddf57
2021-07-19 02:30:33 +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
073b9f55df
[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: I659a720863085881d675cd068505da2b683020a3
2021-07-18 08:11:04 +00:00
Bill Yi
9b92a99d9f
[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: Ib3b3d44a27a06c424d8975dd851e7ced82c3310b
2021-07-18 08:11:00 +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
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