Bill Yi
b7eb3c0448
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ff486543a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294494
Change-Id: I80eea9dcf4cae2c3c872fe41d3c1ee8c6536e6d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:43:48 +00:00
TreeHugger Robot
f20ec29820
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I7f6106fcdf78ce8f3a335c75a27bf8e794326ee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:37:18 +00:00
Bill Yi
6aa3b0a3a9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I989899b2f11e906218ee445f603d46973e88af05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:37:05 +00:00
Bill Yi
cb2cb2e72a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287432
Change-Id: I39cd22fa5a5ece6def936a0501f4226b5925a414
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:36:46 +00:00
TreeHugger Robot
8359385233
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-07-15 17:29:43 +00:00
TreeHugger Robot
188a2c66c1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7d8655936b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: I07ea1b35c425ddda94d74d61f69d50eac84517b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:29:37 +00:00
Bill Yi
cdd61bac15
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fef55df6ec
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: I43aaa9d814fe81b7bdbcd363f66b214dc7f8949b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:29:19 +00:00
Bill Yi
3050a6cb87
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60b5937fb7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19293984
Change-Id: I0697c0805e26144de9fe00eaaf8fee2ad864f7cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:29:02 +00:00
TreeHugger Robot
377685d4a6
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-07-15 17:19:07 +00:00
TreeHugger Robot
7d8655936b
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-07-15 16:56:40 +00:00
TreeHugger Robot
3028e52501
Merge "Save isCanceled state and restore when rotation" into tm-qpr-dev
2022-07-15 05:03:40 +00:00
TreeHugger Robot
e49a84480b
Merge "Run lock before fingerprint enroll" into tm-qpr-dev
2022-07-15 00:37:04 +00:00
lbill
d7f53d4180
Save isCanceled state and restore when rotation
...
- Create mIsCanceled field in FingerprintEnrollEnrolling
- Override onSaveInstanceState and save mIsCanceled state
- onCreate restore mIsCanceled
- shouldStartAutomatically() return mRestoring && !mIsCanceled
- Integrate FingerprintErrorDialog with "try again"-> Clear mIsCanceled
Bug: 237103873
Test: manual enroll UDFPS, and wait for timeout, seeing timeout error
dialog showing above fingerprint enrollment pad.
Change-Id: I3a3010ca12aa0b23fd122a8afc9b82adf5656fb8
2022-07-15 08:14:53 +08:00
TreeHugger Robot
9fcf073bab
Merge "Check portal on fingerprint intro page" into tm-qpr-dev
2022-07-15 00:08:59 +00:00
Bill Yi
30c5704504
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic8eeb16a4833dccdf9924faefd2b2b341ec2d1da
2022-07-14 13:47:48 -07:00
Bill Yi
0f98a4d1ca
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie645e16d70b654b0ed4655392f42ffcb4c38a2f5
2022-07-14 13:42:55 -07:00
Bill Yi
fef55df6ec
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8d79670567a1f2b81f59e9a447c27fcde72a0c4e
2022-07-14 13:38:25 -07:00
Bill Yi
2ff486543a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I089f4ebab3776b2e32596948e43eb1564f38273d
2022-07-14 13:28:43 -07:00
Bill Yi
e148a29a1c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3a97f3d110f4255be27847ab9d25dd758daa29d4
2022-07-14 13:26:48 -07:00
Bill Yi
60b5937fb7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5e84134712147a92c064b7e0e85b58c201bb046e
2022-07-14 13:24:54 -07:00
Milton Wu
504a659ba5
Run lock before fingerprint enroll
...
Run setOrConfirmCredentialsNow() before enrolling fingerprint for
fingerprint-only device.
Bug: 237433373
Test: atest BiometricEnrollActivityTest
Test: Manually test SUW flows for fingerprint-only device
1. check confirm pin case
2. check choose pin case
3. enable always_finish_activities, check confirm pin case
4. enable always_finish_activities, check choose pin case
Change-Id: I68da429145835fc79f83f3292749088dc25fdeee
2022-07-14 08:40:45 +00:00
Bill Yi
415f1b8706
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icdb743843e5eeee000e53ea68ae48f5cbff3da14
2022-07-14 01:20:34 -07:00
Bill Yi
3f841a2af4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibfecfad7ee6ee8cc86fefe7107d8e78bbbf40372
2022-07-14 01:17:02 -07:00
Milton Wu
bd966754ce
Check portal on fingerprint intro page
...
Check SUW portal flag on Fingerprint introduction page. Do not use
suw_max_fingerprints_enrollable as fingerprint count if portal flag is
enable.
Bug: 235655422
Test: m RunSettingsRoboTests \
ROBOTEST_FILTER=FingerprintEnrollIntroductionTest
Test: Manually test "Add another finger" on Deferred and Portal
suggested actions page
Change-Id: I2789d95fb214b5da6d8d03ef77583d064652e69e
2022-07-14 05:28:46 +00:00
Nate Myren
d18f11a84f
Remove location toggle from privacy controls screen
...
Bug: 238857896
Test: manual
Change-Id: Ifc4ccc13271c42a0dd1941e8f26842afbe0411d6
2022-07-13 11:31:16 -07:00
Grace Cheng
e287bbe82b
Merge "Update SFPS Enrollment to have error messages replace title" into tm-qpr-dev
2022-07-13 17:21:16 +00:00
SongFerng Wang
dc6f2df00e
Merge "[WFC] The WFC UI did not refresh after the subscriptionInfoChanged" into tm-qpr-dev
2022-07-13 17:15:12 +00:00
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