SongFerng Wang
9b1493a789
Merge "aggregate the items of network selection list" into sc-dev am: 9e6928ae2e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15340173
Change-Id: I4769f0bcb21bf6b56f8dad38f535472b85437ebe
2021-07-23 09:18:40 +00:00
SongFerng Wang
9e6928ae2e
Merge "aggregate the items of network selection list" into sc-dev
2021-07-23 09:04:58 +00:00
ykhung
4b5be3b73a
Remove some debugging log to avoid print too much data out am: 13bcdba67a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15360451
Change-Id: I0c8e6985c083dd8e9c9958efb796eb0abaf09a4e
2021-07-23 08:50:56 +00:00
SongFerngWang
7f5c984655
aggregate the items of network selection list
...
According to bug comment#44, modem only report one PLMN per RAT
for different cells reported for the same PLMN/RAT combination,
UI affregate those items.
Bug: 173387374
Test: atest NetworkSelectSettingsTest
Change-Id: I155abc8dda7c8ec42cf4fd677bd2aa99d1033ad1
Merged-In: I8e05b9f6784bad7f0de4e79cc6e707749745f0c1
2021-07-23 07:27:30 +00:00
ykhung
13bcdba67a
Remove some debugging log to avoid print too much data out
...
Fixes: 194251993
Fixes: 194021631
Test: make SettingsRoboTests
Change-Id: Ibd1c7ce9d664820b2975039582a1ea5fb18b0be1
2021-07-23 02:52:14 +00:00
YUKAI HUNG
9bb7d79438
Merge "Include new "dex2oat64" process to map into App Optimization name" into sc-dev am: 9d2048ab5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15343065
Change-Id: Iaa89d42b141defa3e3fb1ab8d5b03260d55fe2af
2021-07-21 13:20:11 +00:00
YUKAI HUNG
9d2048ab5b
Merge "Include new "dex2oat64" process to map into App Optimization name" into sc-dev
2021-07-21 13:06:50 +00:00
YUKAI HUNG
0520694736
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: I3c316a639b4029e49947be132d640aec46d8b605
2021-07-21 11:14:36 +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
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
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
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
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
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
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
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
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
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
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
caa670fad4
Merge "Disable the mic/cam toggles when admin disallows" into sc-dev
2021-07-15 19:52:50 +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
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
TreeHugger Robot
2378b0081c
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: I8c83ba382f7e63c2eae59906a1fc60c1a70a4946
2021-07-15 09:01:47 +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
Beth Thibodeau
647b3ef070
Remove lockdown toggle
...
This button will be on by default now, so remove the switch
Bug: 185618694
Test: build
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: Iecbeb590a5b750ec2fcf9c31fece5814241200b1
2021-07-14 19:39:30 -04:00
TreeHugger Robot
000c7a897b
Merge "Fix switch listener on app notif page" into sc-dev am: bef076df47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15273047
Change-Id: I7725f5c5dff01e1840072518f21e0ae661cd9238
2021-07-14 15:52:07 +00:00