Commit Graph

104740 Commits

Author SHA1 Message Date
Grace Cheng
dc82b6364e Update SFPS Enrollment to have error messages replace title
Update SFPS Enrollment to have error messages replace title rather than showing error messages underneath the fingerprint animation

Fixes: 234135107
Test: Enroll finger and see error messages replace title
Change-Id: I106a0147bf69d8dfab99d58e9e309cfb32c650fa
2022-07-12 22:57:17 +00:00
TreeHugger Robot
51d087cd67 Merge "Add function getBatteryHistorySinceLastFullCharge, used to replace getBatteryHistory in BatteryHistoryLoader." into tm-qpr-dev 2022-07-12 16:47:13 +00:00
TreeHugger Robot
fedab69c9a Merge "Support multi-user privacy for battery usage chart" into tm-qpr-dev 2022-07-12 16:40:32 +00:00
SongFerngWang
d9bc33e3b5 [WFC] The WFC UI did not refresh after the subscriptionInfoChanged
Add the listener for subscriptionInfoChanged and update the Visible
of the category.

Bug: 233783112
Test: atest NetworkProviderWifiCallingGroupTest
Change-Id: I7698915abb2f3b0ba2b40d8e78fe4e3302756c91
2022-07-12 14:58:50 +08:00
TreeHugger Robot
0996cb11ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0e046fc4ae -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19241408

Change-Id: I0db9d786ee29749691bd8093a1482a4035a16b63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12 05:18:25 +00:00
Bill Yi
28d5ffe9a8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d4eb4f4b9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19241408

Change-Id: Ib108c314f79f1fc0cc71ec9cb37b6d4f33e3bc6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12 05:17:57 +00:00
TreeHugger Robot
0e046fc4ae Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-07-12 04:54:58 +00:00
Amy Hsu
f51951c9d3 Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev am: 1f7fab03c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19124855

Change-Id: Ie9b806a127e7eced1b9d790beb874e712e452de5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12 04:15:21 +00:00
Amy Hsu
1f7fab03c8 Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev 2022-07-12 03:54:27 +00:00
Robert Luo
bc66c0aba9 Merge "RESTRICT AUTOMERGE Make VPN by Google One always appear in VPN settings" into tm-qpr-dev 2022-07-11 23:36:02 +00:00
TreeHugger Robot
f38e8e6194 Merge "RESTRICT AUTOMERGE Implement advanced vpn ui in vpn settings" into tm-qpr-dev 2022-07-11 22:50:58 +00:00
Bill Yi
3d4eb4f4b9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I043b44e648cce2709d66ea0b0cdc4c367de844d6
2022-07-11 11:59:15 -07:00
ykhung
764d513d00 Support multi-user privacy for battery usage chart
When there are multiple accounts in the devices, the battery usage list
is shared in the current design. We will aggregate other users usage
data into a single item to support multi-user privacy requirements

Screenshot: https://screenshot.googleplex.com/AkFTUtNvnoxcuGR

Bug: 202119550
Test: make RunSettingsRoboTests
Change-Id: I6cb55f0d50a4caca83212a0a54410530a032c089
2022-07-12 00:17:43 +08:00
Kuan Wang
e39ecafa1f Add function getBatteryHistorySinceLastFullCharge, used to replace
getBatteryHistory in BatteryHistoryLoader.

getBatteryHistory couldn't be changed directly as it needs to be kept
for other features.

Bug: 236101687
Test: make RunSettingsRoboTests
Change-Id: I3e3cdd3a0225228bf76f6750f6a56f031666720f
Merged-In: I3e3cdd3a0225228bf76f6750f6a56f031666720f
2022-07-11 09:10:08 +00:00
Grace Cheng
3c53dac81b Display screen protector string and icon in fingerprint enrollment only on relevant devices
Sets screen protector string and icon visibility to visible on UDFPS, and non-visible on non-UDFPS devices

Fixes: 230156966
Test: Navigate to fingerprint enrollment page to see string & icon are
gone on side-FPS device

Change-Id: I527fb0d944a7c8180297ad44efa3e9bba3012703
2022-07-08 23:39:32 +00:00
SongFerngWang
4a48dc5e96 [MEP] Hide the preferred SIM dialog when the user has replaced the SIM am: 286dce6b6e am: 289796e9a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194541

Change-Id: Ib1c261e07e1878b60bd067694e19eea92bb11866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-08 20:45:47 +00:00
Bill Yi
75bbbd7e94 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 44c1f479d3 -s ours am: 1fd3156ec7 -s ours am: 36139e2e09 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170611

Change-Id: I1563e164994b59d9bb16972a6ec1f55d9237a20d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-08 20:45:05 +00:00
Bill Yi
1e80eafe18 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c65a1d804 -s ours am: 992e8328bd -s ours am: e73c1c14be -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170611

Change-Id: I60a66ff7f0ce28070f827c380871914b0265c9a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-08 20:44:59 +00:00
Bill Yi
8802d04401 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b55af7d44d -s ours am: 50eb4245cc -s ours am: 93f6d69a60 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170607

Change-Id: I3a725066560165e538b616b8078ba51e5565bdb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-08 20:44:50 +00:00
Bill Yi
09b0e3ecd2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: eda8321a12 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19169721

Change-Id: I08ee4c34afc8f86ddaf2e5c4e01015387210c655
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-08 20:41:56 +00:00
Bill Yi
6f2d360a38 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80c1acdaf0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19169721

Change-Id: I45a63dc4fecdc183e55803bf7989e10d92fe5b03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-08 20:41:42 +00:00
TreeHugger Robot
b182c27349 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d5c37555b7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170618

Change-Id: I098ee079462a0f7cd85aa22516bb0b80b85cb0bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-08 20:38:30 +00:00
Bill Yi
75ad2310e5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2b251ec36 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170618

Change-Id: I46a8c6924ee60efb5dcb7c895af54c5d317a57d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-08 20:38:21 +00:00
TreeHugger Robot
bdceb524a5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e2cd20fa19 -s ours am: bdec4b1993 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170616

Change-Id: I8420909a0317ffe1fc68fe31dc5c54bdcda41f60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-08 20:34:47 +00:00
Bill Yi
5dae5623ea [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72134f4c83 -s ours am: 6e16015e80 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170616

Change-Id: Ic18cefcfec061a2c91cd3bd943c2d6f714afbdc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-08 20:34:45 +00:00
Bill Yi
c4ff0995f6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cab8532874 -s ours am: d656305b74 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19169719

Change-Id: I9d06476ca757e386d8e5c127d7454b0455048e88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-08 20:33:15 +00:00
TreeHugger Robot
ed552ecb6b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e -s ours am: ec5ba801ba -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19128489

Change-Id: I1db9d46a3fdd80511cbace631c180b7d8aac0767
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-08 20:28:11 +00:00
Bill Yi
0dbf58c5c3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19777b98cc -s ours am: e5e9661324 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19128489

Change-Id: I2dc614515ce369e668fea2724c29cfa2a834483c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-08 20:27:56 +00:00
SongFerngWang
289796e9a3 [MEP] Hide the preferred SIM dialog when the user has replaced the SIM am: 286dce6b6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194541

Change-Id: I6b76e6a4efe1dcd72c18e503dd3af853c8536276
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-08 19:08:48 +00:00
Weng Su
be23c28ff2 Prevent leaking Wi-Fi dialog on lock screen
- The Wi-Fi dialog is designed to be displayed on the system UI

- Dismiss Wi-Fi dialog to prevent leaking user data on lock screen

Bug: 231583603
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialogActivityTest

Change-Id: Ie67ff1138ffeddd3e358331d8cef61e0629173e2
2022-07-08 05:43:10 +08:00
SongFerngWang
286dce6b6e [MEP] Hide the preferred SIM dialog when the user has replaced the SIM
Since there is the race condition and it causes UI hides the preferred
SIM dialog. Therefore, to hide the preferred SIM dialog under the
specific condition which the user has replaced the SIM during the
SIM switching.

Bug: 238061853
Test: Manually testing. Device has the psim+esim and the esim's mobile
data on. The tester disables the esim and then UI shows the preferred
SIM dialog.

Change-Id: I01e7d60170c5053730fd3113abd914fb5c0d11c9
2022-07-07 08:39:03 +00:00
Amy Hsu
7087e5c457 [RRS] Activate investigation of screen_resolution in settingsstats
Define a setting string for putting data for suez/settingstats.

Bug: 234035619
Test: Manually check ScreenResolution ap in Settings can work normally.
Merged-In: Ib4622490b0f63139b47f242ebcae916edf291cea
Change-Id: Ib4622490b0f63139b47f242ebcae916edf291cea
2022-07-07 08:15:47 +00:00
TreeHugger Robot
9447ec6d81 Merge "Ignore CRLF strings in display SSIDs to avoid display errors" into tm-qpr-dev 2022-07-06 19:32:12 +00:00
Aleksandar Kiridžić
7914c77660 Merge "speech: Add on-device speech recognition settings entry" into tm-qpr-dev 2022-07-06 18:01:48 +00:00
Bill Yi
36139e2e09 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 44c1f479d3 -s ours am: 1fd3156ec7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170611

Change-Id: Iebdf15669ab9453f15e44fabade6a50d13446fbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 06:02:56 +00:00
Bill Yi
e73c1c14be [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c65a1d804 -s ours am: 992e8328bd -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170611

Change-Id: I00a05a9484f3455c6253361cb874b46c8298148e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 06:02:48 +00:00
Bill Yi
93f6d69a60 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b55af7d44d -s ours am: 50eb4245cc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170607

Change-Id: I1c3ff6920f33eaeb414b73b4d16f4bd36cf2773d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 06:02:40 +00:00
Bill Yi
1fd3156ec7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 44c1f479d3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170611

Change-Id: I4e9f640550a6ba839080bf5db6a76def2ca2f7e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 05:34:08 +00:00
Bill Yi
992e8328bd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c65a1d804 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170611

Change-Id: I6664f45591969573c47e8de87c2aa1f9015ddc3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 05:34:05 +00:00
Bill Yi
50eb4245cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b55af7d44d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170607

Change-Id: Id50143411336cc13e6c029cb2789150b50544f4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 05:33:54 +00:00
Bill Yi
eda8321a12 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-07-06 05:06:38 +00:00
Bill Yi
44c1f479d3 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-07-06 05:05:28 +00:00
TreeHugger Robot
d5c37555b7 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-07-06 05:03:07 +00:00
TreeHugger Robot
f29e93bf9e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-07-05 07:47:58 +00:00
TreeHugger Robot
bdec4b1993 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e2cd20fa19 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170616

Change-Id: I40171e45c01394cb86fe38d0bbde39540906e362
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-05 02:43:41 +00:00
Bill Yi
6e16015e80 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72134f4c83 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170616

Change-Id: Ie98f930ded26e6668da3c5fe60b70df7436d3b2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-05 02:43:34 +00:00
TreeHugger Robot
e2cd20fa19 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-07-05 02:25:30 +00:00
Bill Yi
d656305b74 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cab8532874 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19169719

Change-Id: I6c6ff6cd408fb35ac2604c17787bdc5e3ab96609
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-05 01:51:50 +00:00
Bill Yi
d2b251ec36 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I750415ef848997b21de83b901e41bcf2b141777e
2022-07-04 12:21:22 -07:00
Weng Su
08adf4c2ed Ignore CRLF strings in display SSIDs to avoid display errors
- Keep user-entered SSIDs in Wi-Fi Configuration

- Ignore CRLF strings in display SSIDs only

Bug: 224545390
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksFragmentTest

Change-Id: Ifc081f9c5c02b2d70412f296688b88e44e893add
2022-07-05 03:18:26 +08:00