Commit Graph

17421 Commits

Author SHA1 Message Date
Nino Jagar
720bdde511 Merge "Integrate admin controls for content protection" into main 2024-03-12 17:05:24 +00:00
Joseph Vincent
d003fb1be8 Merge "Show Alert dialog on Hide when locked is enabled" into main 2024-03-12 17:04:44 +00:00
josephpv
3c97c63d62 Show Alert dialog on Hide when locked is enabled
Bug: 325398789
Test: atest HidePrivateSpaceControllerTest
Change-Id: I6bfa3546b3ba56905918f8fd44c5351bf2d284b8
2024-03-12 10:35:56 +00:00
Treehugger Robot
3c26c93bd5 Merge "Add new dialogue when user is going to delete multiple sims where aleast on of them use RAC." into main 2024-03-12 05:45:06 +00:00
Charlotte Lu
470c27b8bd Merge "Add dhcp in advanced settings toggle." into main 2024-03-12 02:32:57 +00:00
Rafael Higuera Silva
9ac44b3aae Add new dialogue when user is going to delete multiple sims where aleast on of them use RAC.
Test: make, manually test, atest com.android.settings.network, atest SubscriptionUtilTest
Bug: 328649505
Change-Id: I0c6fb7b5407179ec6850ece47f486b64759e2d1c
2024-03-11 23:29:30 +00:00
Jacky Wang
e18a651d89 Merge "Reset app preferences does not trigger backup for App battery usages" into main 2024-03-11 09:11:12 +00:00
Angela Wang
c9563a59da Merge changes from topic "ha-preset" into main
* changes:
  Selects presets in device details page (2/2)
  Selects presets in device details page (1/2)
  Separate category controller out of HearingDeviceControlsController
2024-03-11 08:33:46 +00:00
Charlotte Lu
08f8f0ce9e Add dhcp in advanced settings toggle.
Test: Unit Test
Fix: 329002870
Change-Id: I5c57deb1e8ed0dd59a7699b56f5eb99ca29876b8
2024-03-11 06:47:38 +00:00
Jacky Wang
ef8a51fac8 Reset app preferences does not trigger backup for App battery usages
Bug: 328712606
Fix: 328712606
Test: UT && Verify logcat when change/reset App battery usages
Change-Id: Ia3917c8dc2654185f5f048c048362fd47379b7d1
2024-03-11 13:41:03 +08:00
Fan Wu
c8d5701ab5 Merge "Fix AppInfoWithHeaderTest" into main 2024-03-11 04:06:35 +00:00
Treehugger Robot
0003443c3d Merge "Fix Settings profile selector on HSUM" into main 2024-03-08 18:36:27 +00:00
Chun-Ku Lin
9cf7f6e861 Merge "Show QS shortcut option if the a11y feature provides a tile." into main 2024-03-08 17:20:15 +00:00
Nino Jagar
65eb00f0f3 Integrate admin controls for content protection
Bug: 323038631
Test: End-to-end with TestDPC, new units
Change-Id: I98d52fdd95fca023b8eb576c97d563a1f3cab464
2024-03-07 22:56:09 +00:00
Sudheer Shanka
34bd0481df Merge "Remove the developer option to control Quarantine app state." into main 2024-03-07 19:39:55 +00:00
Liahav Eitan
0f37c7463b Fix Settings profile selector on HSUM
Currently Settings ProfileSelectorFragment uses isSystem() to identify
the personal user. This change migrates it to use isMain() in line with
HSUM architecture.

Test: atest SettingsRoboTests:com.android.settings.dashboard.profileselector.ProfileSelectFragmentTest
Fixes: 327610266, 327600527, 327585940, 326574736
Change-Id: I064b2fb295b89cffcd556e151fe1bf4484caf384
2024-03-07 14:41:07 +00:00
Graciela Wissen Putri
aed31bb8bd Follow config overlay's order of aspect ratio options am: a0f573a35e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26456385

Change-Id: I30ff221caba3be36834acb44958cf2aed30c17d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 12:11:14 +00:00
Olivier Nshimiye
b816437d39 Merge changes from topic "add-ps-features-flag" into main
* changes:
  Add Private Space features flag check to Settings tests
  Add an additional flag guard for Private Space implementation
2024-03-07 10:48:58 +00:00
Wilson Wu
4406de67e0 Merge "Add fixed amplitude check for keyboard vibration" into main 2024-03-07 04:30:36 +00:00
Treehugger Robot
1b3c21ef1b Merge "Fixed NPE in FingerprintEnrollIntro" into main 2024-03-07 02:24:40 +00:00
Joshua McCloskey
3c57fcde32 Fixed NPE in FingerprintEnrollIntro
Test: atest FingerprintEnrollIntroductionTest
Fixes: 317515741
Change-Id: Icc4e5cd4fbfea6828684ce6c8fc30acaabe5d315
2024-03-07 00:33:49 +00:00
Chun-Ku Lin
8b67c17a7b Show QS shortcut option if the a11y feature provides a tile.
Bug: 314852953
Test: atest com.android.settings.accessibility
Test: atest com.android.settings.accessibility.shortcuts
Test: manual
Flag: ACONFIG android.view.accessibility.a11y_qs_shortcut STAGING
Change-Id: Id7a6b3adfd4c4f3cb2b9f7fe15269b57a3d00543
2024-03-06 20:26:28 +00:00
Manish Singh
eb840e23f7 Merge "Return the correct position for the profile tab" into main 2024-03-06 19:33:41 +00:00
Wilson Wu
fd45101eee Add fixed amplitude check for keyboard vibration
Make sure the keybaord vibration settings only show
up when fixed amplitude provided to avoid any unsync
behavior with platform.

Bug: 326027376
Test: atest KeyboardVibrationTogglePreferenceControllerTest
Change-Id: I3b4e06660e3eaa6ce537b72831073f092cba37e2
2024-03-06 12:33:07 +00:00
Sudheer Shanka
07251c8262 Remove the developer option to control Quarantine app state.
Bug: 305256093
Test: manual
Change-Id: I28cfb3f1e6c5d3bdab77b7eae2262a03909c45f7
2024-03-06 06:02:38 +00:00
Fan Wu
757633223e Fix AppInfoWithHeaderTest
Use any() in getPackageInfoAsUser() to make the tests more robust regarding PackageManager flags change.

Bug: 315135755

Test: atest
Change-Id: I3857ca3bf2ee23424c78716ed3669fbe87c786f8
2024-03-06 03:30:40 +00:00
Manish Singh
8ca4f47292 Return the correct position for the profile tab
The existing code returns the fixed tab values, which doesn't work
now that the ordering is determined by the user manager's ordering.

Bug: 302278487
Test: manual
Test: atest ProfileSelectFragmentTest
Change-Id: I87b393b8e12e21dc1b38ee75bb43ca9133785c81
2024-03-05 19:50:29 +00:00
Isaac Chai
46369353ed Adding Settings preference for single finger panning feature
Test: Locally tested on device +
MagnificationOneFingerPanningPreferenceControllerTest
Bug: 282039824

Change-Id: I1d1a649060cba862c8f333e6e76184fade2dcdce
2024-03-05 19:10:59 +00:00
Manish Singh
ea341bdf98 Merge "Add controller for location for private profile" into main 2024-03-05 18:48:35 +00:00
Graciela Wissen Putri
a0f573a35e Follow config overlay's order of aspect ratio options
Fix flaky UserAspectRatioAppsPageProviderTest by using advanceUntilIdle
to make sure all coroutines are finished before asserting.

Bug: 325911424
Test: atest UserAspectRatioDetailsTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:32815ad699448c5c5b1f38df6d2d2a881d4251c1)
Merged-In: I83e9a7f31536c1a006789722b0310f3364d14337
Change-Id: I83e9a7f31536c1a006789722b0310f3364d14337
2024-03-05 17:11:59 +00:00
Manish Singh
dd5a8e610c Add controller for location for private profile
Bug: 303196278
Test: manual
Change-Id: I0997918e5046ac803c2c2d117c2e027b4aacc2c2
2024-03-05 16:27:28 +00:00
Fan Wu
739647a46d Merge "Fix settings/widget test failures" into main 2024-03-05 02:13:10 +00:00
Roy Chou
79ee7bc941 Merge "chore(magnification): remove onResume overrides for controllers in ToggleScreenMagnificationPreferenceFragment" into main 2024-03-05 01:32:33 +00:00
Olivier Nshimiye
b4e6f20567 Add Private Space features flag check to Settings tests
Adding this flag check since we are putting all the implementations of Private Space features behind this flag.

Bug: 326060689
Test: Run presubmits and verify that nothing breaks
Change-Id: I2c0e9a1afc3787232425f79d06d4aeba001283ec
2024-03-04 15:43:47 +00:00
Fan Wu
8c8d310767 Fix settings/widget test failures
Also ignore color checker complain introduced by ag/26310215

Bug: 315133235

Test: atest SettingsRoboTests
Change-Id: I88081ab4bb1b01dfbd7b7a0045e2031e7170028a
2024-03-04 16:55:55 +08:00
Angela Wang
6089d3edd6 Merge "Replaces HearingDevicePairingDetail with HearingDevicePairingFragment" into main 2024-03-04 06:53:19 +00:00
Roy Chou
654e43b2e8 chore(magnification): remove onResume overrides for controllers in ToggleScreenMagnificationPreferenceFragment
As b/186731461, so far MagnificationModePreferenceController and other
magnification preference controllers are only used in
ToggleScreenMagnificationPreferenceFragment, which is DashboardFragment.
Since DashboardFragment already updates preference state in its
onResume, so we can remove the onResume overrides in those controllers.
Besides, we can also remove the LifeCycle dependency for the controllers
since it's not used anymore.

Bug: 186731461
Flag: NA
Test: manually
      atest ToggleScreenMagnificationPreferenceFragmentTest
      atest MagnificationAlwaysOnPreferenceControllerTest
      atest MagnificationFollowTypingPreferenceControllerTest
      atest MagnificationJoystickPreferenceControllerTest
      atest MagnificationModePreferenceControllerTest
Change-Id: I379a6a3a985c9d8b7a37bbb878b84cee1bd6adfb
2024-03-04 03:44:59 +00:00
Jacky Wang
006bf17c4f [DataStore] Migrate BatteryBackupHelper to BackupRestoreStorage
Bug: 325144964
Test: Manual tests
Change-Id: I19f7c78969d70648d1e45f1627827d98b1fdd1e0
2024-03-03 22:42:00 +08:00
Treehugger Robot
14f9f67df6 Merge "Make SmartBatterySettings unsearchable when it's not available." into main 2024-03-01 17:56:59 +00:00
Yiling Chuang
93c0dbf98d Make SmartBatterySettings unsearchable when it's not available.
Bug: 323915905
Test: robotest
Change-Id: I5adc9d19b482b8e07237f5c7d62d315556095c38
2024-03-01 16:28:12 +00:00
Shaowei Shen
624e1beca8 Merge "[A11y Setting] Add keyboard keys preferences under A11y page" into main 2024-03-01 13:37:03 +00:00
shaoweishen
a5f5ff4add [A11y Setting] Add keyboard keys preferences under A11y page
Bug: 325851068
Test: make RunSettingsRoboTests
Change-Id: Ic7eb1ec9e260a95d040bee784cbff479a4f087d0
2024-03-01 12:05:30 +00:00
Treehugger Robot
64f740e599 Merge "Revert "Re-enable failed tests under settings/widget/"" into main 2024-03-01 05:02:25 +00:00
Fan Wu
4826dd8c10 Revert "Re-enable failed tests under settings/widget/"
This reverts commit cfb73e2dd3.

Reason for revert:
Still failing when running the entire test suite.

Change-Id: I1783265ca8362a2e1d4b89a1d577e1c0a35bd535
2024-03-01 02:28:07 +00:00
Marcus Ge
12108acc07 Merge "[Accessibility] Add basic metrics logging for color contrast" into main 2024-02-29 21:04:23 +00:00
Yiyi Shen
e5302bc1f1 Merge "[Audiosharing] Gates legacy le audio sharing UI in sound Settings." into main 2024-02-29 09:50:42 +00:00
Angela Wang
b054b05b78 Selects presets in device details page (2/2)
Updates UI and sets preset to remote device when corresponding callback is called.

Bug: 300015207
Test: atest BluetoothDetailsHearingAidsPresetsControllerTest
Change-Id: Ic013b96acaa6161b861fbae32ddfd77387f9bc47
2024-02-29 09:17:36 +00:00
Angela Wang
82e4ed3bd1 Selects presets in device details page (1/2)
Enables users to select their presets in Bluetooth device details page if the device supports HAP.

This CL only contains the UI elements. The full functionality will be introduce in the next CL.

Bug: 300015207
Test: atest BluetoothDetailsHearingDeviceControllerTest
Test: atest BluetoothDetailsHearingAidsPresetsControllerTest
Change-Id: I1ab4781191b0c9e1033a29c30ca61671878bb7e1
2024-02-29 09:17:32 +00:00
Angela Wang
4af270b231 Separate category controller out of HearingDeviceControlsController
We're going to add more different device controls (such as hearing aids presets, volume offset controls or microphone volume controls) into "device_controls_general" PreferenceCategory. It's better to keep the category controller separated from the child controller to better maintain the visibility of the whole category and have a clearer stucture of these controllers.

Bug: 300015207
Test: atest BluetoothDetailsHearingDeviceControllerTest
Test: atest BluetoothDetailsHearingDeviceSettingsControllerTest
Test: atest BluetoothDeviceDetailsFragmentTest
Change-Id: I7f35b02a1120aefa8307e500f7abfce3b8055fbf
2024-02-29 09:17:30 +00:00
Fan Wu
c59c3a3d4f Merge "Re-enable failed tests under settings/widget/" into main 2024-02-29 08:53:15 +00:00