Commit Graph

144161 Commits

Author SHA1 Message Date
Yiling Chuang
fd699a753f Merge "Migrate Battery Saver" into main 2024-10-15 03:05:18 +00:00
Dongzhuo Zhang
538a01023a Add ContactsStorageSettingsActivity to handle the
android.provider.action.SET_DEFAULT_ACCOUNT intent

Test:Manually tested to trigger the contacts storage settings page using intent to start activity.
Bug: 368641291
Flag: com.android.settings.flags.enable_contacts_default_account_in_settings

Change-Id: I83db4c5751c6fec523298a82b82468180906075c
2024-10-15 02:59:21 +00:00
Andy Wickham
51a8a098a5 Merge "Move Contextual Search setting to AOSP." into main 2024-10-15 00:47:04 +00:00
Guojing Yuan
8d30101228 [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 120f2345b8 am: 54142da21f -s ours am: ea96b4ab21 -s ours am: 0d8ed82e9c -s ours am: 65885fd60d -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05 is already in history

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

Change-Id: Ica446b5e5743470995aac5c13a991b02611478b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-15 00:17:02 +00:00
Guojing Yuan
4f1a4e15ce [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 760d594cff -s ours am: d8dcbcd076 -s ours am: c048539b4f -s ours am: 99e4b9de4b -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 e4fe2f5b81 is already in history

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

Change-Id: Id812e359e896b3b9fc0908148f214282c782ee5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-15 00:16:48 +00:00
Guojing Yuan
65885fd60d [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 120f2345b8 am: 54142da21f -s ours am: ea96b4ab21 -s ours am: 0d8ed82e9c -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05 is already in history

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

Change-Id: Ibe59854146bd50d0e87ddc5f53155d494c079537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 23:54:34 +00:00
Guojing Yuan
272531f1e2 [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 120f2345b8 am: 54142da21f -s ours am: ea96b4ab21 -s ours am: e9a76fa03a -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05 is already in history

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

Change-Id: Iae2dd0f9a4d5a8b68e639a8c35d94a345242c8c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 23:54:29 +00:00
Guojing Yuan
99e4b9de4b [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 760d594cff -s ours am: d8dcbcd076 -s ours am: c048539b4f -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 e4fe2f5b81 is already in history

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

Change-Id: I7b70769070b3eed4ce29664bd7aa42c5f9678011
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 23:54:24 +00:00
Guojing Yuan
b082aed12e [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 760d594cff -s ours am: d8dcbcd076 -s ours am: 5a8b643ad8 -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 e4fe2f5b81 is already in history

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

Change-Id: Ia7854f5ad2d3523924c5560bba4da1ff870e388f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 23:54:13 +00:00
Guojing Yuan
e9a76fa03a [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 120f2345b8 am: 54142da21f -s ours am: ea96b4ab21 -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05 is already in history

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

Change-Id: I5a54035fb62801252ff4386b95c21d08b5a699cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 23:46:38 +00:00
Guojing Yuan
0d8ed82e9c [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 120f2345b8 am: 54142da21f -s ours am: ea96b4ab21 -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05 is already in history

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

Change-Id: Ieb97938c211a577d538dc87cc414c39123186ccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 23:46:21 +00:00
Guojing Yuan
ea96b4ab21 [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 120f2345b8 am: 54142da21f -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05 is already in history

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

Change-Id: I6611ffb97886d6bf5efb3c198370a2951c77eb58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 23:38:51 +00:00
Guojing Yuan
5a8b643ad8 [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 760d594cff -s ours am: d8dcbcd076 -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 e4fe2f5b81 is already in history

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

Change-Id: Ia11da90aa315f485db80da8bf16cf36032e8cb2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 23:38:51 +00:00
Guojing Yuan
c048539b4f [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 760d594cff -s ours am: d8dcbcd076 -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 e4fe2f5b81 is already in history

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

Change-Id: I73162c7a274b7042632ae4c917ec489b407bde19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 23:38:35 +00:00
Guojing Yuan
d8dcbcd076 [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 760d594cff -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 e4fe2f5b81 is already in history

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

Change-Id: Id18c4027da722d4874b91aae22d19073f921f416
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 23:19:57 +00:00
Guojing Yuan
54142da21f [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 120f2345b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29710883

Change-Id: I83d612fbcc6ff78dd455ecf30d17d16f99900426
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 23:19:28 +00:00
Guojing Yuan
120f2345b8 [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29710883

Change-Id: I42468b1d2bfb94f7f5645a8e710ed67818a38317
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 23:01:25 +00:00
Guojing Yuan
760d594cff [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29710883

Change-Id: Iab4e925157e013de4d2a34864856bff0b10ae065
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 23:01:23 +00:00
Guojing Yuan
7d7d3c0d61 [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: e4fe2f5b81 am: edf497802d am: 8439a2542d -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 e4fe2f5b81 is already in history

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

Change-Id: I1377715343f89672b630eb7ee8f0de2e47dfc2d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 22:50:26 +00:00
Guojing Yuan
8439a2542d [CDM][NLS] Check if the NLS service has an intent-filter am: e4fe2f5b81 am: edf497802d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711106

Change-Id: I3270fd29d05b97b043ed2d46516f35ef0e9ef793
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 22:25:04 +00:00
Guojing Yuan
b8f13aa47a [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: e4fe2f5b81 am: a0924c7c6a -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 7ae59a42eb is already in history

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

Change-Id: Ie277d32fdb2afbdf99a63f4085041b41104da0c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 22:24:54 +00:00
Chris Antol
4b336e6b00 Merge "Revert^2 "[Catalyst] Add settings service"" into main 2024-10-14 22:24:36 +00:00
Guojing Yuan
a0924c7c6a [CDM][NLS] Check if the NLS service has an intent-filter am: e4fe2f5b81
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711106

Change-Id: I396f1b0749acfad5300f706e62c97a6f136119b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 22:00:14 +00:00
Guojing Yuan
edf497802d [CDM][NLS] Check if the NLS service has an intent-filter am: e4fe2f5b81
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711106

Change-Id: Ic894c297273b36c0df8c9a9055cdd24e40306f38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 21:59:55 +00:00
Riley Jones
a11a960167 Cleanup searchable items on Accessibility > System controls
Flag: EXEMPT xml changes
Bug: 354783604
Test: Manually verify conditions mentioned in bug

Change-Id: I3fd6ddefc0bc666e12bff08046174be0c9e21904
2024-10-14 21:56:40 +00:00
Chris Antol
42e146e9db Revert^2 "[Catalyst] Add settings service"
eafda3c490

Change-Id: I729410b1d9ea2f9c99739faafbb6b40394d7a9dc
2024-10-14 18:56:35 +00:00
Shaowei Shen
6656d59ddf Merge "[Physical Keyboard] Add main page for Repeat keys" into main 2024-10-14 15:32:38 +00:00
Chaitanya Cheemala (xWF)
4063536e20 Merge "Revert "[Catalyst] Add settings service"" into main 2024-10-14 15:08:45 +00:00
Chaitanya Cheemala (xWF)
eafda3c490 Revert "[Catalyst] Add settings service"
Revert submission 29815608-catalyst

Reason for revert: Likely culprit for b/373339105  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:29815608-catalyst

Change-Id: If42ddb09c07da5672c3d55c2517b75647ea77ae5
2024-10-14 14:18:07 +00:00
Haijie Hong
86147371de Merge "Gray out toggle if isAllowChangingState is false" into main 2024-10-14 12:09:31 +00:00
Jacky Wang
b4b01a9890 Merge "[Catalyst] Add settings service" into main 2024-10-14 11:42:26 +00:00
Treehugger Robot
ec14feff81 Merge "Fix bug when bluetooth profile is not in more settings" into main 2024-10-14 11:26:33 +00:00
Jacky Wang
92354f8bed [Catalyst] Add settings service
Bug: 372981584
Flag: com.android.settings.flags.catalyst_service
Test: Manual
Change-Id: I0bb3752e65e879bd831b7d8c83ea160be32a893e
2024-10-14 18:03:05 +08:00
Geoffrey Boullanger
d7f7417a1e Merge "Updated toggles in Date and time settings page" into main 2024-10-14 09:47:00 +00:00
Haijie Hong
c9b450734a Gray out toggle if isAllowChangingState is false
BUG: 343317785
Test: local tested
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: I428b5093477ec9d1ba61cbbdb8430b9e28577d99
2024-10-14 17:43:00 +08:00
Chaohui Wang
da37ff068d Merge "Fix PhoneNumberPreferenceControllerTest" into main 2024-10-14 09:39:32 +00:00
Sunny Shao
01ad71bc89 Migrate Battery Saver
Add the skeleton of the Battery Saver

Test: atest BatterySaverScreenTest
Bug: 368359126
Flag: com.android.settings.flags.catalyst_battery_saver_screen
Change-Id: I05a694c34468c01e4e032275567acbf37615c6f0
2024-10-14 17:34:10 +08:00
Haijie Hong
8cb8aaf36b Fix bug when bluetooth profile is not in more settings
BUG: 343317785
Test: local tested
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: I3f53c3b0b60997aa3a1685fe2512ff2f37b32d18
2024-10-14 17:19:57 +08:00
Treehugger Robot
dc8ed36f47 Merge "Ignore catalyst test in DisplayScreenTest" into main 2024-10-14 05:50:27 +00:00
shaoweishen
cbe75928d9 [Physical Keyboard] Add main page for Repeat keys
Page markup: https://screenshot.googleplex.com/5xCd2wVVyXajdCB.png

Test: atest SettingsRoboTests
Bug: 345399212
Flag: com.android.input.flags.keyboard_repeat_keys
Change-Id: Ie60f4b6ea4de973644103c0aa0bcdfe9a1e758eb
2024-10-14 05:28:41 +00:00
Chaohui Wang
44527db356 Fix PhoneNumberPreferenceControllerTest
Fix: 373247298
Flag: EXEMPT test only
Test: atest PhoneNumberPreferenceControllerTest
Change-Id: Ied4c46beca9130ea2db469e3f5dfe708c84b7373
2024-10-14 13:24:37 +08:00
Jacky Wang
44dfbe6748 Ignore catalyst test in DisplayScreenTest
Bug: 373177618
Bug: 368359268
Flag: EXEMPT fix test
Test: atest
Change-Id: I8de8468f53f4b9ec2c66e8e836bf9cf9072e6e63
2024-10-14 12:55:45 +08:00
Tom Hsu
aeb05239de [automerger skipped] Merge "Avoid test flaky" into main am: ec571901be am: 60d85b9363 -s ours
am skip reason: Merged-In Id1290e6979fdafa93ded6f50e49d6b3464a80b50 with SHA-1 1955144ffc is already in history

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

Change-Id: I1e2920836d72e795ccacab1d08db5e11100e7080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 04:47:32 +00:00
Tom Hsu
60d85b9363 Merge "Avoid test flaky" into main am: ec571901be
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3304564

Change-Id: Id61fef14f799f141304afba7cb2f9cd3fde7e0a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 04:28:08 +00:00
Tom Hsu
ec571901be Merge "Avoid test flaky" into main 2024-10-14 04:13:25 +00:00
Treehugger Robot
0a66344051 Merge "Connect to OWE Wi-Fi network when QR code has no password" into main 2024-10-14 03:52:39 +00:00
SongFerng Wang
be77468166 Merge "Update VPN app dialog message to include version code" into main 2024-10-14 03:37:58 +00:00
Treehugger Robot
eca66d0379 Merge "Update the forEach() into for-loop" into main 2024-10-14 03:05:14 +00:00
Chaohui Wang
e78f7543b8 Merge "Use getEnabledProfiles for ProfileSelectDialog" into main 2024-10-14 02:18:36 +00:00
Weng Su
efe8d52f77 Connect to OWE Wi-Fi network when QR code has no password
- Since there is no password for Wi-Fi security in OPEN and OWE, try to connect to one of them

Bug: 360377330
Flag: EXEMPT bugfix
Test: Manual testing
atest -c WifiDppQrCodeScannerFragmentTest

Change-Id: Ia0a59e099b724170ad993df8b4246b94e0da392c
2024-10-14 07:02:18 +08:00