Curtis Belmonte
ce924dc3fc
Merge "Use correct choose lock password/pattern subtitles" into sc-dev am: 4aa06d7639 am: ec4d101cac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15302650
Change-Id: Id26731218e7cfdef409dbebb55a95396a71761c8
2021-07-15 22:06:02 +00:00
TreeHugger Robot
69be0fa6bf
Merge "Disable the mic/cam toggles when admin disallows" into sc-dev am: caa670fad4 am: c100eb4e32
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15089520
Change-Id: Ifcfdbddceb1e6ed12291f87f2845d46988c7b525
2021-07-15 22:05:53 +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
c3aae8bcdf
Merge "Limit searchability of combined biometric Settings" into sc-dev am: cf1f67e54f am: dca7bb5d4d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15302136
Change-Id: I6149ef3fcf34d5bbf474cab29611ebb02a83f8f8
2021-07-15 19:58:02 +00:00
TreeHugger Robot
2603ad8e04
Merge "Don't also skip fingerprint in SUW when skipping face" into sc-dev am: b1ba3c57af am: 205a6088a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15289659
Change-Id: Ifac150920895adcf0794eb0c28d2ccb97953ef2c
2021-07-15 19:57:51 +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
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
736e9dab83
Merge "Let network mode UI refresh when network type with carrier group changed" into sc-dev am: 685fedd6c2 am: 47837d28c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15283582
Change-Id: If2a42255494f95db530fd50fba80f822170cc84b
2021-07-15 12:24:30 +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
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
TreeHugger Robot
450250950d
Merge "Fix the NPE issue in the Internet Settings" into sc-dev am: 381bbbda8d am: 05207bf774
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15269083
Change-Id: I9de1a21c42da0613299b5cd132c21620c80bd53c
2021-07-15 09:29:47 +00: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
TreeHugger Robot
05207bf774
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: I698d94ea007bea1c883040bf37ac519aa15507be
2021-07-15 09:01:33 +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
TreeHugger Robot
f916865b66
Merge "Fix switch listener on app notif page" into sc-dev am: bef076df47 am: 8bb404d5ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15273047
Change-Id: Ia14df74bb42ecd2689359cf29bf22fcecabc4e52
2021-07-14 16:06:16 +00:00
TreeHugger Robot
8bb404d5ae
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: I4928c1a96fafefa6039a89f6c03e832c9cffd1e0
2021-07-14 15:54:32 +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
139651a789
Merge "Change the condition for showing "no connection"" into sc-dev am: 7429fd1315 am: d1ef148261
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15270340
Change-Id: Ie3371e200043b0ef96513028d6de6a4cb03b37e8
2021-07-14 15:08:03 +00:00
SongFerng Wang
d1ef148261
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: Iae9b006e208a71750b5529c518e63f0d8a119c74
2021-07-14 14:54:55 +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
e8cba63525
Merge "Provides TC ID for accessibility framework feature for "about" and "learn more" part" into sc-v2-dev am: 7f907d35cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175506
Change-Id: Ie28863b4fe41b5d4c4e83c541be546aab13b3f68
2021-07-14 11:59:46 +00:00
Menghan Li
7f907d35cd
Merge "Provides TC ID for accessibility framework feature for "about" and "learn more" part" into sc-v2-dev
2021-07-14 11:48:24 +00:00
Menghan Li
45a8616a55
Merge "Update OWNERS for package settings > accessibility" am: f36c2bc0a4 am: be1e8a077b am: a8c91cd5c3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1765529
Change-Id: I4809783467ed50ba86aee39e2de596aed1ad1360
2021-07-14 10:21: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
menghanli
bae720ffc3
Provides TC ID for accessibility framework feature for "about" and "learn more" part
...
Goal: Improve readability which is a bit difficult because of string concatenation for accurate translation.
Root cause: In some locales, framework features name would be a word rather than a product name. Hence it need to be in the different position in a sentence.
Solution: Use whole sentence to translate instead of concatenating the string could solve this issue.
Bug: 185478543
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityFooterPreferenceControllerTest
Change-Id: Id198805329be9c773df87f38a074ae956e4d0cdb
2021-07-14 15:15:48 +08:00
menghanli
b537d169b4
Update OWNERS for package settings > accessibility
...
Bug: 193589847
Test: Manual
Change-Id: I57d27181d83cf47df9f4d0d359a2d76df3e3c91a
2021-07-14 14:16:35 +08:00
SongFerngWang
5f8f44c720
Change the condition for showing "no connection"
...
The "no connection" should be shown in no data cell connection.
Bug: 193273081
Test: atest passed
- SubscriptionsPreferenceControllerTest.java
- ProviderModelSliceHelperTest.java
- ProviderModelSliceTest.java
- NetworkProviderWorkerTest.java
Change-Id: Ied8a34d13d4bfc81e9136e05ba41cbb4233c9ad8
2021-07-14 02:49:36 +00:00
Curtis Belmonte
f0aadce0d6
Merge "Add "eyes open" setting message to face enroll intro" into sc-dev am: e796b8bf6e am: b7c2a07117
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15147510
Change-Id: I609f5f3264ddb862ab0d19fb7ba36494d0f87f94
2021-07-13 17:01:01 +00:00
Curtis Belmonte
9683efd43f
Merge "Add "eyes open" setting message to face enroll intro" into sc-dev am: e796b8bf6e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15147510
Change-Id: I2991e2efc7f0ecc56c8b34ed6ab8bbb42e8d22a3
2021-07-13 16:46:51 +00:00
Curtis Belmonte
b7c2a07117
Merge "Add "eyes open" setting message to face enroll intro" into sc-dev am: e796b8bf6e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15147510
Change-Id: I68d7b957f9910d2328dbec028ee292a17723ed7a
2021-07-13 16:45:24 +00:00
Curtis Belmonte
e796b8bf6e
Merge "Add "eyes open" setting message to face enroll intro" into sc-dev
2021-07-13 16:36:53 +00:00
Bonian Chen
0a21b821ac
Merge "[Settings] Settings within each SIM not been displayed to the user" into sc-dev am: 92e82aa07e am: d72cf9a10b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076790
Change-Id: I2e5e842cb54419ccda06e87d807d8b0ee03959ce
2021-07-13 15:15:40 +00:00
Bonian Chen
d0fabb37df
Merge "[Settings] Settings within each SIM not been displayed to the user" into sc-dev am: 92e82aa07e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076790
Change-Id: I3d36d901fe95e9f4e5ab09c8f1cbe606dc7427df
2021-07-13 14:58:00 +00:00
Bonian Chen
d72cf9a10b
Merge "[Settings] Settings within each SIM not been displayed to the user" into sc-dev am: 92e82aa07e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076790
Change-Id: I370e04ab8c7ebcda3ef40c3b858b2c24da9d9d10
2021-07-13 14:57:29 +00:00