Commit Graph

136917 Commits

Author SHA1 Message Date
Hao Dong
03af4571e3 Add tests for Education
Test: atest FingerprintEnrollFindSensorViewModelV2Test
Bug: 295206773

Change-Id: I741ddf49fccae7a301e2fb79194ce8cc6b966070
2023-10-13 00:51:55 +00:00
Peiyong Lin
8e6af783ce Allow ANGLE developer option toggle UI enabled if ANGLE is enabled.
Previously the ANGLE developer option toggle UI was disabled by default
and a user would need to use adb command to set the debug property to
true to enable it, and every reboot would reset the debug property to
false again and hence disable the toggle UI again. However, since ANGLE
is still in experiment, we would like to make sure it's not easy to
enable but easy to disable. This patch keeps ANGLE toggle UI enabled
when ANGLE is enabled so that users can easily disable. Once ANGLE is
disabled, if the debug property is not set to true, the toggle UI will
remain disabled.

Bug: b/293503000
Test: atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest
Test: atest SettingsRoboTests:GraphicsDriverEnableAngleAsSystemDriverControllerTest
Change-Id: I2e63431cd0d8cf4712fc278646627fbf34a2b542
2023-10-13 00:36:36 +00:00
Wa Gao
780a0cb230 Merge "Adds the strings for ODAD content protection setting page." into main 2023-10-12 22:59:16 +00:00
Priyanka Advani
fc3433b454 Merge "Revert "Implement sfps enroll improvement feature with feature provider"" into main 2023-10-12 21:07:27 +00:00
Becca Hughes
ccbe3cea6f Merge "Add support for settingsActivity in settings" into main 2023-10-12 19:19:55 +00:00
Wa Gao
b73092bfb1 Adds the strings for ODAD content protection setting page.
Bug: b/302189945
Change-Id: Idca0fe5b4f49f8fb69e63a3e58a7e8fa85300021
2023-10-12 19:13:17 +00:00
Priyanka Advani
a99bab5b57 Revert "Implement sfps enroll improvement feature with feature provider"
This reverts commit 2ffe187d1b.

Reason for revert: Likely culprit for b/305048300

Change-Id: Ia9d2d98bcb09d63dacde7134c20ded2ed51f9ab4
2023-10-12 19:02:20 +00:00
Guojing Yuan
b139406d4b [CDM PS] Fix an NPE when the device is not associated
Bug: 290063372

Test: manually tested
Change-Id: Ifd55e2849ebaff1340fdf9e61edd75971187e12b
2023-10-12 17:40:53 +00:00
Alice Kuo
ddec75bb39 Config LE audio connection by default
Use LE audio connection by default, and allow to have the differenct
configuration per project (system property). As using LE audio connection by
default, the toggle, "Show LE audio toggle in Device Details", would be
useless, hide this toggle based on the project configuration

Bug: 300012501
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeDeviceDetailsPreferenceControllerTest
Change-Id: Ia4df48d6a71b5b9f11bd91a69971c8393412da13
2023-10-13 01:22:36 +08:00
Alice Kuo
b2336ea7db LE Audio Allowlist toggle behavior refactor
The patch contains below behavior changes
1. hide this toggle as the device doesn't enable LE audio profile
2. disable this toggle as bluetooth off, or LE audio feature is disabled
   dynamically
3. disable this toggle if the device doesn't configure to use LE audio
   connection by default
4. switch toggle on to bypass LE Audio allowlist

Bug: 300012501
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioAllowListPreferenceControllerTest
Change-Id: I5ae9c860ba22047fc03ffde7ad3b3f44f9a9a9f0
2023-10-13 01:22:18 +08:00
Alice Kuo
f8767cdd31 Remove allowlist reboot behavior
As we switch to use allowlist or bypass it, it would only impact the
default connection after the paring. So based on it, we don't need to
force device reboot to apply the setting

Bug: 300012501
Test: m SettingsGoogle
Change-Id: I0b63a68e1263692e922968c122b96b5635b9861f
2023-10-13 01:22:06 +08:00
Alice Kuo
c41abccb0f Change the LE Audio Allowlist toggle wording
Change the wording from "Enable LE Audio Allowlist" to "Bypass LE Audio
Allowlist"

Bug: 300012501
Test: m SettingsGoogle
Change-Id: Ifc6544e443856d03d408783ecb070c5002ff14a1
2023-10-13 01:21:21 +08:00
Allen Su
ff986f338d Rename namespace to globalintl
Bug: 301380610
Bug: 292155080
Test: adb shell device_config put globalintl com.android.settings.flags.locale_notification_enabled true
      adb shell device_config put globalintl com.android.settings.flags.terms_of_address_enabled true
Change-Id: I36d879e0121bd033d2b39189026b8cfe032e9fcf
2023-10-12 16:44:46 +00:00
Allen Su
a9b979c79f Merge "Implement B&R for locale notification" into main 2023-10-12 10:42:34 +00:00
Jun Lan
0e5688a454 Merge "Fix uninstalled app issue on battery usage page" into main 2023-10-12 10:32:40 +00:00
Jun Lan
c617e3c638 Fix uninstalled app issue on battery usage page
Context: for uninstalled app, we cannot get the package UID, name and icon from the package manager, and the app would be shown as package name and default system icon in the page. For those unknown apps, we will put them into 'Uninstalled app' component for a quick fix.

Some lines are changed by auto format, and please ignore it. I will send out a follow up cl to format all battery files. It can improve the productivity if all team members are using the auto-format tool during the development.

Before: https://screenshot.googleplex.com/6zmFVgMxHGYMwqH
After: https://screenshot.googleplex.com/3cZwrhcE8zhDyfN

Test: manual
Bug: 264339271
Change-Id: I61a32675a31eefc8fdb1a408fbcebe9a2d6dcd68
2023-10-12 18:18:14 +08:00
Graciela Putri
73baa33064 Merge "Add aspect ratio settings to advanced category children" into udc-qpr-dev am: 6e9666ab53 am: 8319a77527
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956690

Change-Id: Id37daa262c9f38adb7eaa0ed4ecb929979c3c08f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 10:00:52 +00:00
Graciela Putri
39386158b7 Merge "Remove 4:3 aspect ratio option for foldables" into udc-qpr-dev am: 2147c152ac am: 94f7219937
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007832

Change-Id: I08c0fcfe2c81b9c36b63165233e844e975bf93e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 10:00:30 +00:00
Wu Ahan
8fb032a73f Merge "Implement sfps enroll improvement feature with feature provider" into main 2023-10-12 09:54:51 +00:00
Graciela Putri
8319a77527 Merge "Add aspect ratio settings to advanced category children" into udc-qpr-dev am: 6e9666ab53
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956690

Change-Id: Ib02ae9caef06a46938947806dac8aabb1fa12d94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 09:45:46 +00:00
chelseahao
74b85e4247 Show toggle summary for LE audio toggle only when the device is not in the allowlist.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsProfilesControllerTest
Change-Id: I68040e7e92630f6efac0e1fb0f35a39ebca3cfad
2023-10-12 09:39:08 +00:00
Felix Oghina
7029251a4b Merge "[speech] fix settings robo tests" into main 2023-10-12 09:37:57 +00:00
Graciela Putri
6e9666ab53 Merge "Add aspect ratio settings to advanced category children" into udc-qpr-dev 2023-10-12 09:30:41 +00:00
Graciela Putri
94f7219937 Merge "Remove 4:3 aspect ratio option for foldables" into udc-qpr-dev am: 2147c152ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007832

Change-Id: Iab27c31c7512f4f7e48d8b10d410044c4db39aa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 09:28:31 +00:00
Graciela Putri
2147c152ac Merge "Remove 4:3 aspect ratio option for foldables" into udc-qpr-dev 2023-10-12 09:07:50 +00:00
Chaohui Wang
cd6beaca97 Merge "Remove wifi_settings" into main 2023-10-12 08:17:44 +00:00
Weng Su
3f1fb952f2 Merge "Fix NullPointerException in WifiConfigController" into main 2023-10-12 07:42:41 +00:00
Weng Su
de77e7bf92 Fix NullPointerException in WifiConfigController
- Add null checking for spinners to avoid NullPointerException in Monkey tests.

Fix: 302628103
Test: unit test
atest -c WifiConfigControllerTest

Change-Id: I301163b85b0b87edba9eee2c1b34d5a6104eaaea
2023-10-12 14:45:20 +08:00
Chaohui Wang
d18baed65f Remove wifi_settings
Bug: 285231003
Test: m Settings
Change-Id: Ic3410e8449f97e0da049db053977a66f6e60b9b3
2023-10-12 14:35:57 +08:00
Angela Wang
6b95155040 Merge "Fix pair other ear button not hidden correctly for dual device" into main 2023-10-12 05:45:27 +00:00
Chaohui Wang
e16afdb73a Merge "Optimize DataUsagePreferenceController" into main 2023-10-12 02:58:54 +00:00
Treehugger Robot
6402b83e0e [automerger skipped] Merge "Clean up obsolete aliases for Truth." into main am: 4b0bf8f98d am: b06310a63f am: 409a6b2492 am: 23c571ff2b -s ours am: 8f4a7e7505 -s ours
am skip reason: Merged-In I8aab463c74d5e869d949a2b712886a9cc4d15709 with SHA-1 15e17e0119 is already in history

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

Change-Id: Icef92513bd3ece34c10c4a7fb860f2c245d8759d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 02:48:21 +00:00
Treehugger Robot
8f4a7e7505 [automerger skipped] Merge "Clean up obsolete aliases for Truth." into main am: 4b0bf8f98d am: b06310a63f am: 409a6b2492 am: 23c571ff2b -s ours
am skip reason: Merged-In I8aab463c74d5e869d949a2b712886a9cc4d15709 with SHA-1 15e17e0119 is already in history

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

Change-Id: Ibf9478072143dfbe6af85271c9c4e5aa5c49626b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 02:16:33 +00:00
Treehugger Robot
23c571ff2b Merge "Clean up obsolete aliases for Truth." into main am: 4b0bf8f98d am: b06310a63f am: 409a6b2492
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776829

Change-Id: I8873863c35e54bc92f5aae982fe159a5e5e46438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 01:43:51 +00:00
Treehugger Robot
409a6b2492 Merge "Clean up obsolete aliases for Truth." into main am: 4b0bf8f98d am: b06310a63f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776829

Change-Id: Id95f85e07c45a722a5229507be58cb582ca3587e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 01:11:05 +00:00
Treehugger Robot
b06310a63f Merge "Clean up obsolete aliases for Truth." into main am: 4b0bf8f98d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776829

Change-Id: Id02586892e1b22d8450098323183c1ad33ca8574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 00:38:18 +00:00
Treehugger Robot
4b0bf8f98d Merge "Clean up obsolete aliases for Truth." into main 2023-10-11 23:59:17 +00:00
Becca Hughes
4951641ddb Merge "Fix icon UX bug" into main 2023-10-11 23:50:29 +00:00
Krzysztof Kosiński
665b151f87 Clean up obsolete aliases for Truth.
Bug: 255714762
Test: presubmit
Change-Id: I8aab463c74d5e869d949a2b712886a9cc4d15709
Merged-In: I8aab463c74d5e869d949a2b712886a9cc4d15709
2023-10-11 23:10:01 +00:00
Krzysztof Kosiński
6199490cd3 [automerger skipped] Clean up obsolete aliases for Truth. am: 15e17e0119 -s ours
am skip reason: Merged-In I8aab463c74d5e869d949a2b712886a9cc4d15709 with SHA-1 c81fbcef2e is already in history

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

Change-Id: I827777c46799016062f942c4ebb25702dddda5ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 22:47:04 +00:00
Rex Hoffman
54ef7c6be8 Get basic tests working with ActivityScenario and manifest
Test: atest MemtagPreferenceControllerTest
Bug: 302146641
Change-Id: I06d94ae151cadd8498b009886ba7d4bd888911cc
2023-10-11 20:59:41 +00:00
Treehugger Robot
acd95546b2 Merge "Clean up obsolete aliases for Truth." into main 2023-10-11 20:40:29 +00:00
Becca Hughes
fa040ab39d Add support for settingsActivity in settings
Adds support for apps to define settingsActivity
in their manifest which will be launched on tap
in CredMan settings.

Test: ondevice manual test
Bug: 300014059
Change-Id: I3c8879fc86cd9b90bed2a301afaa7d5b75e87e3d
2023-10-11 13:40:09 -07:00
Krzysztof Kosiński
15e17e0119 Clean up obsolete aliases for Truth.
Bug: 255714762
Test: presubmit
Change-Id: I8aab463c74d5e869d949a2b712886a9cc4d15709
Merged-In: I8aab463c74d5e869d949a2b712886a9cc4d15709
2023-10-11 19:41:36 +00:00
Krzysztof Kosiński
c81fbcef2e Clean up obsolete aliases for Truth.
Bug: 255714762
Test: presubmit
Change-Id: I8aab463c74d5e869d949a2b712886a9cc4d15709
2023-10-11 19:39:33 +00:00
Joshua Mccloskey
c320afa70d Merge "Added UI tests for FingerprintEnrollIntro" into main 2023-10-11 18:53:38 +00:00
Saumya Pathak
2770170e0d Merge "Show a separate tab for the Private Space" into main 2023-10-11 16:58:41 +00:00
Allen Su
00c40d85cd Implement B&R for locale notification
Bug: 275306477
Test: by manual
Change-Id: I11471227a1c9263846f9451002d1ef149b460f7d
2023-10-11 16:28:27 +00:00
YK Hung
589c129f43 Merge "Fix the issue that system component items are missing in main branch." into main 2023-10-11 16:20:15 +00:00
Felix Oghina
800db77e62 [speech] fix settings robo tests
Bug: 300161951
Test: atest SettingsRoboTests:com.android.settings.tts
Change-Id: I31a97eb9dae4fb65c52af3075ad4aa82a7165d49
2023-10-11 15:43:20 +00:00