SongFerng Wang
eb2525603f
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: If603e6d8ef89e7be6b88321c9680272f5f5704a6
2021-07-23 09:20:12 +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
f12c64624b
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: I2200d1ac826e3d53435fc67d283084057e681bd8
2021-07-23 08:52:13 +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
TreeHugger Robot
bd41311025
Merge "Update accesibility button to suuport accessibility gesutre" into sc-v2-dev
2021-07-22 18:54:00 +00:00
TreeHugger Robot
b1bdec314a
Merge "Add back the shortcut dialog content for accessibility gesture" into sc-v2-dev
2021-07-22 18:54:00 +00:00
TreeHugger Robot
750dc4a067
Merge "Add back the accessibility gesture tutorial dialog in system navigation" into sc-v2-dev
2021-07-22 18:54:00 +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
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
e20cfa4854
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: I404d161723ddf9b2476ea9790fe2d364c76553aa
2021-07-21 05:07:56 +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
7b17b326b0
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: Ieb42859423c25a0467cf83a1dbcb3f3a3db2e660
2021-07-21 00:36:14 +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
73e12ba36e
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: Id994e83b6361d16faf3e3761fb845a18bca886e3
2021-07-19 19:55:57 +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
0eb13d6df8
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: Ibbc0b965e9b0676cefc78570f5ec46c6bbc30330
2021-07-19 13:12:40 +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
YUKAI HUNG
f2cfcfbb00
Merge "Enhance battery usage refresh content log for performance testing" into sc-v2-dev
2021-07-19 09:50:07 +00:00
ykhung
8c4f097592
Enhance battery usage refresh content log for performance testing
...
Fixes: 194021631
Test: make SettingsRoboTests
Change-Id: If013befb7a9aaf590762cec10035269e66588ab7
2021-07-19 04:58: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
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
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
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
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
c916876cc7
Merge "Update the illustrations of System navigation page." into sc-dev
2021-07-16 11:37:51 +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
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
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
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
20e57d33ff
Merge "Remove lockdown toggle" into sc-dev
2021-07-15 22:44:24 +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
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
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
Jason Chang
8f432ce9ea
Fix hold volume keys don't trigger the one handed mode in
...
One-handed mode settings page
Add to support observing A11y's Shortcut Hardware provider key
ACCESSIBILITY_SHORTCUT_TARGET_SERVICE
Bug: 193411296
Test: manual verified on System > Gestures > One-handed mode shortcut
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.OneHandedEnablePreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.OneHandedMainSwitchPreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.OneHandedActionPullDownPrefControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.OneHandedActionShowNotificationPrefControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.OneHandedPreferenceCategoryControllerTest"
Change-Id: I4704a56873f14e52db8f7c0468eed17f190c5dce
2021-07-15 12:55:48 +00:00
SongFerng Wang
47837d28c1
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: Idf28e6e41aff03a0ce2aa16752be455794be16b7
2021-07-15 12:10:50 +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