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
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
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
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
TreeHugger Robot
246951b84e
[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: Iee8ff1a157bb03c32d93a1a9605e1512460bc61a
2021-07-15 21:57:01 +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
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
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
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
Bill Yi
9604721601
[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: I38941fa8549fca1b21c8e63035c557dba22934c7
2021-07-15 01:15:01 +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
Bill Yi
4dc320540d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia76dcfef58e0d6c025e4b93e9fda413fc26216c3
2021-07-14 22:04:54 +00: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
TreeHugger Robot
bef076df47
Merge "Fix switch listener on app notif page" into sc-dev
2021-07-14 15:41:04 +00:00
SongFerng Wang
9bfa6c19d0
Merge "Change the condition for showing "no connection"" into sc-dev am: 7429fd1315
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15270340
Change-Id: I61b5feed494b241832062d461634fa3f9fefd5e3
2021-07-14 14:53:57 +00:00
SongFerng Wang
7429fd1315
Merge "Change the condition for showing "no connection"" into sc-dev
2021-07-14 14:38:00 +00:00
Julia Reynolds
e41c89da2a
Fix switch listener on app notif page
...
Test: RoboTests, manually change setting
Fixes: 193442605
Change-Id: Ie93469479e252811921a6451853b073dadb0d0a1
2021-07-14 10:31:30 -04:00
Weng Su
5a916eaaf9
Fix the NPE issue in the Internet Settings
...
- Missing to remove the mRemoveLoadingRunnable in the onStop() function, which will cause the callback to run after the fragment is destroyed and encounter this NPE issue.
Bug: 193405782
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I48b85173db1e6689dd056ba71f2fac776ffabbc9
2021-07-14 14:27:39 +00:00
Menghan Li
a8c91cd5c3
Merge "Update OWNERS for package settings > accessibility" am: f36c2bc0a4
am: be1e8a077b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1765529
Change-Id: I8eae86bc892cd045ee8d4c01cbbcc493dca85f71
2021-07-14 10:09:56 +00:00
Menghan Li
be1e8a077b
Merge "Update OWNERS for package settings > accessibility" am: f36c2bc0a4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1765529
Change-Id: Ife618f059ab34b3df08c51b52629a83c6a4c0426
2021-07-14 09:55:44 +00:00
Menghan Li
f36c2bc0a4
Merge "Update OWNERS for package settings > accessibility"
2021-07-14 09:41:41 +00:00