Commit Graph

136891 Commits

Author SHA1 Message Date
Chun-Ku Lin
b87b655f24 Merge "Fix AccessibilityDetailsSettingsFragmentTest" into main 2023-10-16 18:29:13 +00:00
Guojing Yuan
31fe9920ce Merge "[CDM PS] Fix an NPE when the device is not associated" into main 2023-10-16 17:16:56 +00:00
Wu Ahan
667341c343 Reland sfps enroll improvement feature with feature provider
Prior cl, ag/24720067, was reverted due to platinum failed,
this cl fixes the fails (NPE on UDFPS).

Bug: 288155127
Bug: 305132251
Test: Manually check on Lynx and Felix
Test: atest BiometricsE2eTests:FingerprintEnrollSuccessTest
Test: abtd for platinum, see b/305048300#comment14
Change-Id: I90f4ea14853edf03abd8ffe0b7874894eb2d4f81
2023-10-16 15:23:18 +00:00
Chaohui Wang
f80f42ac71 New ComposePreference
And ComposePreferenceController.

So we can use Spa in Preferences based UI.

Bug: 280864229
Test: unit test
Change-Id: Ida6dc62b54de9513d014ad899a65876d3499a02c
2023-10-16 19:05:10 +08:00
Chelsea Hao
ad3dede7c7 Merge "Show toggle summary for LE audio toggle only when the device is not in the allowlist." into main 2023-10-16 10:05:22 +00:00
Chaohui Wang
2aa75f6ad5 Merge "Refresh the DataUsageList when resume" into main 2023-10-16 05:16:55 +00:00
Treehugger Robot
726e4d479d Merge "AirplaneModePreferenceController: Fix NPE when toggle is hidden" into main am: 3eea9e53a1 am: 72943317d2 am: 99a382a05f am: dcd5c3ea0e am: 22b54a82e5
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2767862

Change-Id: If9977aa145341824a2e51926b6ec43c36133cd81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 04:45:42 +00:00
Treehugger Robot
22b54a82e5 Merge "AirplaneModePreferenceController: Fix NPE when toggle is hidden" into main am: 3eea9e53a1 am: 72943317d2 am: 99a382a05f am: dcd5c3ea0e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2767862

Change-Id: Ic48cfef3f29f8ba4d8512c73334eb006a8ff2c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 04:15:33 +00:00
Treehugger Robot
dcd5c3ea0e Merge "AirplaneModePreferenceController: Fix NPE when toggle is hidden" into main am: 3eea9e53a1 am: 72943317d2 am: 99a382a05f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2767862

Change-Id: Ifb295e18feee4a67f4088966d0a19dc0a5ba1fb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 03:42:06 +00:00
Treehugger Robot
99a382a05f Merge "AirplaneModePreferenceController: Fix NPE when toggle is hidden" into main am: 3eea9e53a1 am: 72943317d2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2767862

Change-Id: I5f5f1c389edb778a44aad736081ff077dcd402aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 03:08:55 +00:00
Treehugger Robot
72943317d2 Merge "AirplaneModePreferenceController: Fix NPE when toggle is hidden" into main am: 3eea9e53a1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2767862

Change-Id: Id9c81a0d31b4a0452d614b68b6850342a94ab3aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 02:37:41 +00:00
Treehugger Robot
3eea9e53a1 Merge "AirplaneModePreferenceController: Fix NPE when toggle is hidden" into main 2023-10-16 01:52:44 +00:00
Chaohui Wang
d9a372204b Refresh the DataUsageList when resume
Like when back from AppDataUsage page.

Bug: 295260929
Test: manual - on DataUsageList
Change-Id: I0b1698e47f06cbe731794a2a6b04e9c9ac9450d8
2023-10-14 19:34:09 +08:00
Alice Kuo
55b8e79016 Merge changes from topic "le_audio_allowlist" into main
* changes:
  Config LE audio connection by default
  LE Audio Allowlist toggle behavior refactor
  Remove allowlist reboot behavior
  Change the LE Audio Allowlist toggle wording
2023-10-14 08:59:51 +00:00
Chun-Ku Lin
7a79871cd2 Fix AccessibilityDetailsSettingsFragmentTest
**Root cause**
With the latest Robolectric migration, it now requires move the
FragmentController to visible so that when we call
fragment#getActivity() it won't return null.

Fix: 300158481
Test: atest AccessibilityDetailsSettingsFragmentTest
Change-Id: Ic1e7a1b0a5dd3248950e7362f081ed53f0562bf1
2023-10-14 01:06:19 +00:00
Chun-Ku Lin
9a0c7ba7da Fix AccessibilitySettingsTest
**Root cause**
- We can no longer mock the fragment.getActivity method because it's a
  final method.
- We need to use custom shadows to implement the method we use but not
  shadowed in Robolectric. (e.g. ColorDisplayManager's
  isReduceBrightColorsActivated method)

Bug: 300157873
Test: atest AccessibilitySettingsTest
Change-Id: Ia7d039dd2e31e6b4a7b9382827f9006d4133ca1d
2023-10-13 21:55:22 +00:00
Joshua McCloskey
cdc3bf0d00 Adding screenshot tests to settings
Test: atest SettingsScreenshotTests
Change-Id: I2d22df2e233561e44b233b8ebdfc0291e37aef6b
2023-10-13 19:20:47 +00:00
Chun-Ku Lin
92e6fa4088 Merge "Fix ToggleScreenMagnificationPreferenceFragmentTest" into main 2023-10-13 17:18:27 +00:00
YK Hung
261db5468f Merge "Fix broken RoboTests in "com.android.settings.fuelgauge.*"" into main 2023-10-13 10:04:25 +00:00
mxyyiyi
a8fa5aad69 Fix broken RoboTests in "com.android.settings.fuelgauge.*"
Bug: 305125530
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge.*"
Change-Id: Idaf2a5da4aef3a2fe317fc1f5a24ba9ba457cadd
2023-10-13 15:46:44 +08:00
Chaohui Wang
a1243188ce Merge "Prevent unnecessary reconnection for wifi privacy" into main 2023-10-13 07:08:45 +00:00
Allen Su
ed4b7e736e Merge "Rename namespace to globalintl" into main 2023-10-13 05:14:33 +00:00
Peiyong Lin
ccf778a8a0 Merge "Allow ANGLE developer option toggle UI enabled if ANGLE is enabled." into main 2023-10-13 04:57:32 +00:00
Chun-Ku Lin
ccdb949cc9 Fix ToggleScreenMagnificationPreferenceFragmentTest
**Root cause**
ShadowFragment makes the test using an empty implementation of onCreate,
hence the test execution throws SuperNotCalledException.

ShadowFragment was accidentally added to this test when migrate to the
latest Robolectric. Removing ShadowFragment in the config fixes the
test.

Fix: 300158627
Test: atest ToggleScreenMagnificationPreferenceFragmentTest
Change-Id: I8782ac11a93c5f89b781dcca1713968ed18802cf
2023-10-13 02:44:12 +00:00
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