Commit Graph

135525 Commits

Author SHA1 Message Date
Treehugger Robot
71235aa403 Merge "Fixed the robo test failed in FoldLockBehaviorSettingsTest" into main 2023-09-18 07:36:10 +00:00
Sudheer Shanka
abbb5c4dc3 Add controls in dev options to quarantine apps.
Bug: 297934650
Test: m -j RunSettingsRoboTests
Test: atest SettingsUnitTests
Change-Id: Ic0f35b370c04dd4ed3baaf3610b46ff1b37a0463
2023-09-18 07:27:37 +00:00
Sunny Shao
572636110a Fixed the robo test failed in FoldLockBehaviorSettingsTest
- Use the ShadowSystemSettings instead of SystemSettings.

Fixes: 300201006
Test: atest SettingsRoboTests:com.android.settings.display.FoldLockBehaviorSettingsTest
Change-Id: I360bda0b0b35692e0eaf2060aadb791ecb9dd039
2023-09-18 14:27:16 +08:00
Charlotte Lu
fcf31b668d Merge "Use flag to switch to the new UI." into main 2023-09-18 05:24:30 +00:00
Charlotte Lu
0ce7202d7a Use flag to switch to the new UI.
Bug: 194175217
Test: Munual
Change-Id: Ie3047cebd4a79dea07614b48ad33ba759802cbe8
2023-09-18 12:03:27 +08:00
Alice Kuo
aa734eb52a Use system properties for the le audio toggle ui config instead
Config LE audio UI per devices. Change to use system properties instead

Bug: 300807171
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioDeviceDetailsPreferenceControllerTest
Change-Id: Id0d624f516b9fdbe2380e5f10da5c69b08eea6a4
2023-09-18 03:05:59 +00:00
Chaohui Wang
0cb8d91e4e Create DataUsageListAppsController
Move apps group logic from DataUsageList.

Also add key to AppDataUsagePreference, which reduce flaky and keep
scroll position when back from app detail page.

Bug: 290856342
Test: manual - on DataUsageList
Test: unit test
Change-Id: I61e2b6bd9b192b7230e3553dbc6038f5d59bd303
2023-09-17 13:51:11 +08:00
Chaohui Wang
56deb8465e New NetworkOperatorSettingsTest
Also DataUsageSettingsTest and NfcSettingsTest.

Fix: 236276001
Test: ui test
Change-Id: Idba525e3d4bbf40fbb414cf76afb9c71166179d9
2023-09-16 13:23:50 +08:00
Guojing Yuan
089318d92f [automerger skipped] Merge "[CDM] Add Permissions Sync toggle" into udc-qpr-dev am: d43d6f259a am: e0cce7bf6a -s ours
am skip reason: Merged-In I75d4370eed98275e2f99d65620229bdb57193fb8 with SHA-1 756d23cad1 is already in history

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

Change-Id: I671bb4be5173026121760ab83d18ffde0137868b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 03:17:19 +00:00
Behnam Heydarshahi
e711c0f256 Merge "PanelSlicesAdapter: load slice label safely" into udc-qpr-dev am: c46e8546b5 am: a38edf1ab2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24664970

Change-Id: I09416fd5dee6842179358c6bb9bba6c533841045
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 02:55:24 +00:00
Treehugger Robot
f54ad5e03c Merge "Use launcher namespace instead of settings-ui namespace." into udc-qpr-dev am: d78136fe29 am: 713c4b3bf5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24761915

Change-Id: I319ee97f1105bc5cf83aa561ee336c0effc19414
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 02:52:49 +00:00
Graciela Putri
13821ceb45 Merge "Remove moreOptions in aspect ratio settings" into udc-qpr-dev am: 263126b580 am: 285a139c6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24757660

Change-Id: I7fd06c631b9ad2ffd1749ec05f074883e730fe01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 02:52:37 +00:00
Treehugger Robot
ca00cd7778 [automerger skipped] Merge "Refresh title in the Network details header" into udc-qpr-dev am: 6aaf49dc1d am: 51749d4418 -s ours
am skip reason: Merged-In I4634c152b550c59bd9854cde1b91da44442aa879 with SHA-1 54d0709409 is already in history

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

Change-Id: I528cc58cc5b2eebd0b90684de54efac56ca19831
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 02:52:07 +00:00
Bill Yi
1411687465 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6601eee9a7 -s ours am: dc677b1dae -s ours am: 15d2faa382 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id745a2e010e67d0ed6ceae490362a1bbb3998852
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 02:31:07 +00:00
Bill Yi
1de52d2cbb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a0fbff331 -s ours am: 9132dea94c -s ours am: 0f7805baae -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6d75c73f99dc99e77f02b16f1feab05ed2c5ecc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 02:31:04 +00:00
Bill Yi
c8d3c82a0e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 61f7c7c880 -s ours am: 7b008e0d30 -s ours am: 2d940f20b5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If08b297e01224dcf6855dc27cd2acfb4f811bc07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 02:31:01 +00:00
Bill Yi
71ce4344aa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3cedcebd1e -s ours am: a092264ef6 -s ours am: bbb4689c50 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If5d130f8688a385559bc3266403761d81a771853
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 02:30:47 +00:00
Bill Yi
9947e031c1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6d1533eec9 -s ours am: bd60635182 -s ours am: f3e92a07f1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia6bb681ecfd3342bd0839e200bda35622e123436
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 02:30:31 +00:00
Bill Yi
c4eacb8d0f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f75591fa73 -s ours am: 9100600fc1 -s ours am: cba2a350d0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icececfb79e5d5238cbab51831b43a883c7b8f509
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 02:30:15 +00:00
Bill Yi
e87ba3651d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6601eee9a7 -s ours am: 14a4b2ac68 -s ours am: cb2ae5d9ee -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic4c6b4c27f1498e619db1faa1da7e0b1ce8afdbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 02:24:57 +00:00
Bill Yi
7e16bd12f1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a0fbff331 -s ours am: 17d779411a -s ours am: 52fdc92144 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia7020409018e70b867d06562a0124779a5cd4e52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 02:24:54 +00:00
Bill Yi
d96c68b0bc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 61f7c7c880 -s ours am: 837abf9244 -s ours am: 68059e120b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iec01161b470902165fab78238c3008cf4f6e0171
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 02:24:51 +00:00
Bill Yi
ca81d2ac22 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3cedcebd1e -s ours am: c66c9a3b8e -s ours am: df130891a4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4cd972eceb6fd64d5389c1aabb6fb9c768328c75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 02:24:38 +00:00
Bill Yi
fadc888878 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6d1533eec9 -s ours am: 1c98d2236a -s ours am: 20def9d388 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I11427995bd6193a0a6f1800cc9bb40306d170ae7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 02:24:19 +00:00
Bill Yi
1f47c55166 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f75591fa73 -s ours am: 1840690d24 -s ours am: 02f11dcb34 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I146a3865b925d66e5378d85a0cde381d4bca0e9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 02:24:05 +00:00
Bill Yi
3eca78debd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 880a595859 -s ours am: 1f8443d6d2 -s ours am: 49e318ce55 -s ours am: 245712159f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7cb322a355234997d09b722d001f2b9f3052c7a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:48:10 +00:00
Bill Yi
2d856f42cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d26a94857 -s ours am: 250f3c8c9b -s ours am: 3cf873896e -s ours am: 1fd629396d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib787c46e604163528cd721c7b428784d6d6fa930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:48:07 +00:00
Bill Yi
aeb53231b4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eaa3838179 -s ours am: 44adc2b02a -s ours am: 465cf9500b -s ours am: 35d51f1fc8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idd6a441644f129a472e5241cc4f22358eaa50f60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:48:04 +00:00
Bill Yi
3f02db9afd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5753866bb -s ours am: 1605dfab0b -s ours am: 779bd81952 -s ours am: a80e2a969d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I751868270d0990b8f7f6d2ae8454087162407f64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:47:54 +00:00
Bill Yi
9459f3f372 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 883a2b633e -s ours am: 02cdab0a91 -s ours am: cc92c9228e -s ours am: 6f48b8c62c -s ours
am skip reason: subject contains skip directive

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

Change-Id: If8299adb6c901d1fa389c6c0acf229687bdcdfe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:47:42 +00:00
Bill Yi
18049682bd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 880a595859 -s ours am: 1f8443d6d2 -s ours am: f673fe0435 -s ours am: 1d28dfd4f9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I91f14c6155406517659b1ef6e9b1d45174febc1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:42:29 +00:00
Bill Yi
19d2a3b691 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d26a94857 -s ours am: 250f3c8c9b -s ours am: efe7e127be -s ours am: eb656e8c71 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2f8b6841a636113bcadc92568f95fb4921dd5c07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:42:27 +00:00
Bill Yi
953ab91289 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eaa3838179 -s ours am: 44adc2b02a -s ours am: a40e89c5a5 -s ours am: 7c6d9f85cc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I24a9840710e4abe081c85430f8b01688d0474607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:42:20 +00:00
Bill Yi
4f1a5cf2a1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5753866bb -s ours am: 1605dfab0b -s ours am: 11ed798977 -s ours am: 98ac0b381f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id9bd3282a3d8cfc0e90ec2a0f382b140acbdd129
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:42:06 +00:00
Bill Yi
b5f6094ec8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 883a2b633e -s ours am: 02cdab0a91 -s ours am: b6e2010daf -s ours am: 936c8519c4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I69d17ea14c288ca7c477ddfcbb19eaee310ca2bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:42:01 +00:00
Bill Yi
0f29b9bc51 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 880a595859 -s ours am: cca1e959ee -s ours am: 2e4673500f -s ours am: dc44ac77cc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id4fe828d075369b73a22c96b7c3975621fafde78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:34:42 +00:00
Bill Yi
6a9d166bcd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d26a94857 -s ours am: 4e2f191fe5 -s ours am: df9839f6d9 -s ours am: 7e7efd0f80 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9afd2275f926f7397afc643439268cf01da9d31a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:34:38 +00:00
Bill Yi
ffaca8c1c5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eaa3838179 -s ours am: 64677e15d9 -s ours am: 8f1383cba3 -s ours am: aa2ae14f84 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1970b353561930c6c79f19b8ac9c53a2aad00f07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:34:35 +00:00
Bill Yi
674f6bde06 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5753866bb -s ours am: ebedb167fc -s ours am: 28743336b7 -s ours am: 73006ce3e3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id0f95a1174cae3739e3a3fd1ff87af646ba76fa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:34:19 +00:00
Bill Yi
b8ce7243d4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 883a2b633e -s ours am: b1e0ae99ce -s ours am: 8c3f41b3f7 -s ours am: 588c5b7c9d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I359eb5189e7433e612e23a384865050031f2a0fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:34:02 +00:00
Guojing Yuan
e0cce7bf6a Merge "[CDM] Add Permissions Sync toggle" into udc-qpr-dev am: d43d6f259a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24708184

Change-Id: I3c29e5b9a46695e5c21a837e00891cc22e0bff4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 21:49:46 +00:00
Guojing Yuan
d43d6f259a Merge "[CDM] Add Permissions Sync toggle" into udc-qpr-dev 2023-09-15 21:15:00 +00:00
Bhavuk Jain
0c7ac1bdc6 Fixed a11y announcement while setting a PIN
This CL removes explicitly setting the disabled state of the confirm
button while reconfirming the PIN in the setting of PIN flow. We do this
since otherwise a11y services announces the state of the button which is
confusing for users.

Bug: b/281953347
Test: Tested by building and installing Settings APK on local device,
and checking a11y announcement. Also setup a PIN to see if the setup
flow is working properly.

Change-Id: I91b592310e240c3994049330c8a881740a3a0d59
2023-09-15 19:31:16 +00:00
Guojing Yuan
5f86e8ff03 [CDM] Add Permissions Sync toggle
Bug: 290063372

Test: manually tested the toggle
Change-Id: I75d4370eed98275e2f99d65620229bdb57193fb8
Merged-In: I75d4370eed98275e2f99d65620229bdb57193fb8
2023-09-15 18:05:37 +00:00
Behnam Heydarshahi
a38edf1ab2 Merge "PanelSlicesAdapter: load slice label safely" into udc-qpr-dev am: c46e8546b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24664970

Change-Id: I08ca157dc7fc5ac41697023265268603e737c044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 17:21:07 +00:00
Behnam Heydarshahi
c46e8546b5 Merge "PanelSlicesAdapter: load slice label safely" into udc-qpr-dev 2023-09-15 16:52:10 +00:00
Treehugger Robot
713c4b3bf5 Merge "Use launcher namespace instead of settings-ui namespace." into udc-qpr-dev am: d78136fe29
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24761915

Change-Id: I188286f9d70e4518d11bf1408718961da57dfcc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 16:26:30 +00:00
Joshua Mccloskey
48621c5aea Merge changes If2fc46b1,Ib54da7a8 into main
* changes:
  Add enroll() in FingerprintManagerInteractor.
  Fix SettingsV2 tests.
2023-09-15 16:03:04 +00:00
Chaohui Wang
14655b03fb Merge "Fix AppInstallerInfoPreferenceTest flakiness" into main 2023-09-15 15:57:50 +00:00
Treehugger Robot
d78136fe29 Merge "Use launcher namespace instead of settings-ui namespace." into udc-qpr-dev 2023-09-15 15:15:00 +00:00