Commit Graph

109926 Commits

Author SHA1 Message Date
Milton Wu
9b998b7dac Refine checkMaxEnrolled() for fingerprint
FingerprintEnrollIntroduction shall allow setting 2nd fingerprint if
this intent is coming from "Anything else" page in SUW.

Bug: 228418807
Test: Manually test fingerprint in SUW
Test: ROBOTEST FingerprintEnrollIntroduction and
      SetupFingerprintEnrollIntroduction
Change-Id: I62edeb91f90b32f62b3ca2b2ea04ec427b31d483
2022-09-07 07:49:42 +00:00
Bill Yi
e935326ab9 Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE
Merged-In: I3048482c0e9c74bc4488fb76e7166b4e94bf1e98
Change-Id: I60bd05c8418800fe8f9f432e11d4ca97d03e57a2
2022-09-06 22:34:26 -07:00
lbill
82a42834b1 Fix regression of pressing power key cancel sfps enrollment
Previous ag/19699461 used to fix UdfpsControllerOverlay bug.
However, we didn't consider a feature click power button to
notify user with a Toast on sfps project.

Bug: 245383975
Bug: 228261883
Bug: 242478941
Bug: 227905887
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Test: manual verify sfps enrollment, press/long press power key would
not cancel enrollment.
Test: manual verify udfps enrollment, UdfpsControllerOverlay lose focus
cancel enrollment.

Change-Id: I44394bdb91660b27a704064a7f7cdc5d0ad95d30
2022-09-07 04:01:40 +00:00
Shen Lin
fa6a8e9767 Fix NPE crash in TextToSpeechSettings
Recyclerview's getItemAnimator() is nullable so we need a null check.

Bug: 245383855
Test: Manual

Change-Id: Iebad430e81a32b7fa8ebe0543abf3f122befb7e5
2022-09-07 10:26:39 +08:00
Treehugger Robot
4b4795676e Merge "Fix NPE crash in UwbPreferenceController and optimize the lifecycle observer adding condition in page" am: b2a466d92f am: a9c6040eb8 am: d24f4a3f54 am: 41fc3efd4c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2206258

Change-Id: I8f3a0597e938b3d1fd1a3e87a89f95834716c16d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-07 01:51:12 +00:00
Treehugger Robot
41fc3efd4c Merge "Fix NPE crash in UwbPreferenceController and optimize the lifecycle observer adding condition in page" am: b2a466d92f am: a9c6040eb8 am: d24f4a3f54
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2206258

Change-Id: Ie5e21d09224749e8d8e2c321cff3d73bd21d3669
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-07 01:11:26 +00:00
Treehugger Robot
d24f4a3f54 Merge "Fix NPE crash in UwbPreferenceController and optimize the lifecycle observer adding condition in page" am: b2a466d92f am: a9c6040eb8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2206258

Change-Id: I3048482c0e9c74bc4488fb76e7166b4e94bf1e98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-07 00:41:43 +00:00
Treehugger Robot
a9c6040eb8 Merge "Fix NPE crash in UwbPreferenceController and optimize the lifecycle observer adding condition in page" am: b2a466d92f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2206258

Change-Id: I57cb6db3271266734f2fe383de0d4575dad57cdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-07 00:14:44 +00:00
Treehugger Robot
b2a466d92f Merge "Fix NPE crash in UwbPreferenceController and optimize the lifecycle observer adding condition in page" 2022-09-06 23:54:40 +00:00
Lucas Silva
8f3ab66298 Update dream complications toggle summary
Change-Id: I49f3ac13bec5689e2aa69bae48f9a406ee6e467a
Fixes: 243973622
Test: manually flashed device and verified string in dream settings
2022-09-06 19:16:26 +00:00
TreeHugger Robot
32c2f9b75f Merge "Fix Incorrect Trust Agent Count" into tm-qpr-dev am: 9f1dba6017
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19669514

Change-Id: I2334c56c62c3f019ad50d505a91b08351c392aee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-06 19:01:06 +00:00
TreeHugger Robot
9f1dba6017 Merge "Fix Incorrect Trust Agent Count" into tm-qpr-dev 2022-09-06 18:29:43 +00:00
Treehugger Robot
1a0c26dd7e Merge "Crash in PreferredSimDialogFragment" am: a512817aba am: 42cc405781 am: a4915b26f4 am: 140d335571
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2207096

Change-Id: I3b2652dfe7abb46558109033328de07011cd0594
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-06 13:59:59 +00:00
Treehugger Robot
140d335571 Merge "Crash in PreferredSimDialogFragment" am: a512817aba am: 42cc405781 am: a4915b26f4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2207096

Change-Id: I16700abafd46e5d24964a7dc16aa45fd2c5809f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-06 13:33:49 +00:00
Treehugger Robot
a4915b26f4 Merge "Crash in PreferredSimDialogFragment" am: a512817aba am: 42cc405781
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2207096

Change-Id: If9f57b125c3e336cd6f10325e8e066f918000e75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-06 13:05:24 +00:00
Treehugger Robot
42cc405781 Merge "Crash in PreferredSimDialogFragment" am: a512817aba
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2207096

Change-Id: I0add210f4a071fb61b9647ba9a81518d050ff64d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-06 12:37:01 +00:00
Treehugger Robot
a512817aba Merge "Crash in PreferredSimDialogFragment" 2022-09-06 10:28:38 +00:00
Shen Lin
0b9a6304aa Fix NPE crash in UwbPreferenceController and optimize the lifecycle observer adding condition in page
This patch contains two fixes:

- Make sure mUwbManager is non-null by calling isUwbSupportedOnDevice to avoid a NPE.
- Modify AdvancedConnectedDeviceDashboardFragment, add lifecycle observer only if device supports UWB.

Bug: 244871579

Test: manual test and Robotest.
Change-Id: I78f97794a66f3fb487f067c4570899e21c254acf
2022-09-06 14:55:08 +08:00
SongFerng Wang
47b3d752e7 [automerger skipped] Merge "Add owner for job handover" into tm-qpr-dev am: 17122f9617 -s ours
am skip reason: Merged-In I9259596811cba08a21b78eebbe2f847e1aa6818c with SHA-1 2d59130485 is already in history

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

Change-Id: I1adbac389a48d0b5bf204423833ffb0bc539c81f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-06 05:34:53 +00:00
SongFerngWang
156ec79127 [automerger skipped] Add owner for job handover am: 76870250e8 -s ours
am skip reason: Merged-In I9259596811cba08a21b78eebbe2f847e1aa6818c with SHA-1 2d59130485 is already in history

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

Change-Id: Id765cb89c21ab238edc807fea7b3786552f6137d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-06 05:34:49 +00:00
SongFerng Wang
17122f9617 Merge "Add owner for job handover" into tm-qpr-dev 2022-09-06 04:57:49 +00:00
Pingzhi Wang
77ce80d6cb Crash in PreferredSimDialogFragment
NullPointerException when removing physical SIM card

Bug: 244622300
Test: Manual
Change-Id: Ie32c4d07e4c77a0460265a47501e332ae62e17e4
2022-09-05 11:29:42 +02:00
TreeHugger Robot
ada5c33946 Merge "Hide toggle to Turn on Wi-Fi automatically preference in Search settings" into tm-qpr-dev am: 06cc4ed4ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19816198

Change-Id: I6b16ef9121b890647e1ff49ee6e380b8bbdaa832
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-05 08:36:45 +00:00
TreeHugger Robot
06cc4ed4ab Merge "Hide toggle to Turn on Wi-Fi automatically preference in Search settings" into tm-qpr-dev 2022-09-05 07:51:36 +00:00
YK Hung
1a7168a114 Merge changes from topic "app_battery_usage" into tm-qpr-dev am: 0bad72889e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19726220

Change-Id: Ie2f3751d89e77aecc9a5e799127ea8c8d1478430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-05 04:04:22 +00:00
Tiffany Nguyen
d36c2f7cba Align strings and UX across the different pages. am: c2ad30d432
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19728353

Change-Id: I0eabd6c4dd7f42020c2551f1f63f1cf20de33b23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-05 04:04:20 +00:00
Tiffany Nguyen
9e491e0f1b Move restricted apps page to new battery optimization page. am: 032649b4f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19727752

Change-Id: I4285c9d6e7df762f697f5ad62fe30b2e6151cdd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-05 04:04:18 +00:00
Tiffany Nguyen
3fa60efb6c Add Apps > Battery optimization page implementation. am: 6147e0fa5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19726219

Change-Id: I3498f3c1482acf6ece57bd1297bffd9c08d81c5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-05 04:04:13 +00:00
YK Hung
0bad72889e Merge changes from topic "app_battery_usage" into tm-qpr-dev
* changes:
  Fix loading bug when switching filters.
  Align strings and UX across the different pages.
  Move restricted apps page to new battery optimization page.
  Add Apps > Battery optimization page implementation.
2022-09-05 03:17:57 +00:00
TreeHugger Robot
c5e80e0aaf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3888c098fb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7af19cc462d22141cf8fc2ef9d53bbde22910e9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-05 00:32:35 +00:00
Bill Yi
2213fc1069 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6feabc3dad -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4350ceab9413e48e3f76758d3beb3221ace538ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-05 00:32:18 +00:00
TreeHugger Robot
4beca01b06 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 62d1153dfd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I339e8eea3c2f9a8429dedc3582a748a4e7012ee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-05 00:31:59 +00:00
Bill Yi
5bbf519694 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 50bf87b270 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idcc796d1a4bb8e136b03b50d91813a19db60caa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-05 00:31:37 +00:00
TreeHugger Robot
3888c098fb Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-04 23:48:18 +00:00
TreeHugger Robot
62d1153dfd Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-04 23:48:18 +00:00
TreeHugger Robot
0748645697 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 63a4a1196b -s ours am: 2d0b98ca99 -s ours am: 892c5a54c1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iadc0f8e7c12762f1e5df25711a94741071df0061
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-04 22:04:41 +00:00
Bill Yi
1fb2951ca5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8835e20681 -s ours am: 7f7bf6920a -s ours am: e04a56746e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5ee1f46d74d46759d3a78a476d8fea1d95cd868c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-04 22:04:28 +00:00
Bill Yi
ee55c985d9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75445048e8 -s ours am: 838fce70df -s ours am: 94af5a0ba6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia5d818729b418c46fcf35b2828f6b433910f6e26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-04 22:04:09 +00:00
TreeHugger Robot
96f6ecac9a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 98f921cf42 -s ours am: bb55f01a53 -s ours am: 5763bbd1b2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieff79ed77d2fc1bbd919b6e2cec5fe3f67719ebe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-04 21:54:48 +00:00
Bill Yi
00b0c3c7f6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c798596fd5 -s ours am: f84668d5ce -s ours am: 0563d709ef -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icc64407ed7ab1aa119404ec98c76d88ac5a7934b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-04 21:54:36 +00:00
Bill Yi
95a8af5717 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de9688841c -s ours am: fb32967d7b -s ours am: 9795b711c6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I41de0494c2aeb69b6128a7e2297dd653f94c8689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-04 21:54:19 +00:00
TreeHugger Robot
892c5a54c1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 63a4a1196b -s ours am: 2d0b98ca99 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3936b5c8825b735e31a74730d3989a14b14876de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-04 21:48:45 +00:00
Bill Yi
e04a56746e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8835e20681 -s ours am: 7f7bf6920a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic1ecd6f560443a22258404849ad5b9e82b607a0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-04 21:48:30 +00:00
Bill Yi
94af5a0ba6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75445048e8 -s ours am: 838fce70df -s ours
am skip reason: subject contains skip directive

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

Change-Id: If6fe3f0e9c29ef791b70624216131945cf2bed0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-04 21:48:16 +00:00
TreeHugger Robot
5763bbd1b2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 98f921cf42 -s ours am: bb55f01a53 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0f9e6873ebd64f5bbcb858645945a93810277ba1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-04 21:40:19 +00:00
Bill Yi
0563d709ef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c798596fd5 -s ours am: f84668d5ce -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ife3543fdd33c39cb13b8f1f5b821e26714d87cdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-04 21:40:02 +00:00
Bill Yi
9795b711c6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de9688841c -s ours am: fb32967d7b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6f95207f6b9b24aa3863c8ebe869cfca5b5badad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-04 21:39:50 +00:00
TreeHugger Robot
b391bb7f26 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 98f921cf42 -s ours am: 7cfbf2e0d3 -s ours am: 4f2ed5b544 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1950f62588d0b1123230267c4ac3fa3b826d8775
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-04 21:35:30 +00:00
Bill Yi
33ee33fb34 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c798596fd5 -s ours am: 810c7b6e7a -s ours am: 6ae361a3bd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I53c57d3db564e325f405dc83f73a00032506170d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-04 21:35:21 +00:00
Bill Yi
f635191bf3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de9688841c -s ours am: 01a2a417e0 -s ours am: 8d02a428d4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If95d7aca351dfd49b862d418d20b7b9f60f3b0c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-04 21:35:15 +00:00