Commit Graph

108418 Commits

Author SHA1 Message Date
Bill Yi
8ca2243678 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60b5937fb7 -s ours am: 3050a6cb87 -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: I69eef3df05e16dec54876cc89bdc069747318828
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 17:45:24 +00:00
TreeHugger Robot
fe9539f0a4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 377685d4a6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie5ea5d6931a58e9f21fd9a30b21ae6575c394fc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 17:44:19 +00:00
Bill Yi
9d6d73301d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 30c5704504 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic146ce400d245dd4c6e6a27a26c5094c9f14748f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 17:44:03 +00:00
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
3ff66be05a [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: Ia7d530db0b0b29d1f927da0ef723360a69a14b55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 17:25:19 +00:00
Bill Yi
84ce084f90 [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: Ib17ef4b92b91a29d269755ff32c20197c18cfb18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 17:25:03 +00:00
Bill Yi
bc5abed2bd [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: Ibdf0138afbf959edefbf88629e3d5f79ac2097c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 17:24:44 +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
3928fcabab Merge "Save isCanceled state and restore when rotation" into tm-qpr-dev am: 3028e52501
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19267966

Change-Id: I6072236085c1feec6588d8b06931517086f32d48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 05:21:45 +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
14f791bf73 Merge "Run lock before fingerprint enroll" into tm-qpr-dev am: e49a84480b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19260206

Change-Id: I72fbe236492e87c7b6d23c0de36c8dd307f035e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 00:43:02 +00:00
TreeHugger Robot
e49a84480b Merge "Run lock before fingerprint enroll" into tm-qpr-dev 2022-07-15 00:37:04 +00:00
TreeHugger Robot
f14704504b Merge "Check portal on fingerprint intro page" into tm-qpr-dev am: 9fcf073bab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19267972

Change-Id: I738b4d76e633f359cdaedc4fee43f0975c60e7e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 00:33:48 +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
Nate Myren
b055df3b8c Remove location toggle from privacy controls screen am: d18f11a84f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19281813

Change-Id: I7b2286f4cfbb022ea6cdfffa9ef1b42da6a05062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 20:52:30 +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
Treehugger Robot
bcc4a3b4e6 Merge "Fix ExtraText lint errors" am: 000bc450b0 am: 91420db7c7 am: 2058af23ac am: 52afebe91e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2141272

Change-Id: I29468d623adeb7f25bc4e20dcca7e3e6c3e2509a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 12:40:10 +00:00
Treehugger Robot
52afebe91e Merge "Fix ExtraText lint errors" am: 000bc450b0 am: 91420db7c7 am: 2058af23ac
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2141272

Change-Id: Id7da7c8d7565087f996577689c7515b3094dcf2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 12:23:06 +00:00
Treehugger Robot
2058af23ac Merge "Fix ExtraText lint errors" am: 000bc450b0 am: 91420db7c7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2141272

Change-Id: I0caf8634598434942ce4e3ecd2bbd3c32adf1fb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 11:58:53 +00:00
Treehugger Robot
91420db7c7 Merge "Fix ExtraText lint errors" am: 000bc450b0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2141272

Change-Id: Ia0f5c48b9581ab8722c06e226acd59e9ac18cde3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 11:32:07 +00:00
Treehugger Robot
000bc450b0 Merge "Fix ExtraText lint errors" 2022-07-14 11:14:59 +00: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
b04079323c Merge "Update SFPS Enrollment to have error messages replace title" into tm-qpr-dev am: e287bbe82b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19264894

Change-Id: Ie4c31048df6afc3dcb115abebdabe100ffd12fc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 17:26:17 +00:00
SongFerng Wang
b59e099ce6 Merge "[WFC] The WFC UI did not refresh after the subscriptionInfoChanged" into tm-qpr-dev am: dc6f2df00e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19222900

Change-Id: Id4d3e4fe19aa697fb465d5d572cbb3ed7cf6be41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 17:26:05 +00: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
005876ae80 Merge "Add function getBatteryHistorySinceLastFullCharge, used to replace getBatteryHistory in BatteryHistoryLoader." into tm-qpr-dev am: 51d087cd67
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19235232

Change-Id: Ic7576a9592b3b9ef71af52001c02f0db17a41312
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12 16:56:03 +00:00
TreeHugger Robot
a51b1baeaa Merge "Support multi-user privacy for battery usage chart" into tm-qpr-dev am: fedab69c9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19235726

Change-Id: I2d241c16e537f0131a95f70528dd47c75791f0ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12 16:54:06 +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