Commit Graph

22549 Commits

Author SHA1 Message Date
Matías Hernández
6a5e7b9631 Merge "Changes to the trigger segment" into main 2024-07-23 20:02:56 +00:00
Daniel Norman
914643da7d Merge "Checks that prebundled categories contain only preinstalled contents." into main 2024-07-23 19:14:59 +00:00
Matías Hernández
9e2ac046e4 Changes to the trigger segment
* Switch is always visible, even without a configuration activity
* Custom icon, title, and summary for some mode types (such as SCHEDULE_TIME, etc).
* Default texts in case of missing trigger description.
* Different icons for having/missing configuration activity.
* Move the section to the top of the screen.

Bug: 349376785
Test: atest ZenModeTriggerLinkPreferenceControllerTest
Flag: android.app.modes_ui
Change-Id: I960318899cf4da20ffc5765818429d5790d05067
2024-07-23 18:14:34 +02:00
YK Hung
ba11a4246a Merge "Ignore broadcast intent from additional profile." into main 2024-07-23 15:35:46 +00:00
mxyyiyi
d4965bd5cc Ignore broadcast intent from additional profile.
- Use isAdditionalProfile() to ignore intent from either work or private profile.

Bug: 354828134
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusage
Flag: EXEMPT bug fix
Change-Id: Ic0c91d956e4bfcd53576629efab4be847c94155e
2024-07-23 19:31:05 +08:00
Treehugger Robot
b761f43fd2 Merge "Add mandatory biometric prompt to platform surfaces (3/N)" into main 2024-07-23 05:20:19 +00:00
Diya Bera
9bae71c15c Add mandatory biometric prompt to platform surfaces (3/N)
Pass user ids for identity check. This is to make sure that the right
user is requested auth for different profiles.

Flag: android.hardware.biometrics.Flags.MANDATORY_BIOMETRICS
Bug: 339910718
Test: atest UtilsTest
Change-Id: I953b56e9bfd1edd49d080124905d42a23247b7a7
2024-07-23 04:07:08 +00:00
Chelsea Hao
7a01fb2679 Merge changes Ibb68252c,Ide20e07f,I5d2e2c70 into main
* changes:
  Add accessibility label for "QR code" scanner. Also added landscape mode.
  Add accessibility label for "QR code" image. Also added landscape mode.
  Add accessibility label for "QR code" button in Audio sharing page.
2024-07-23 02:52:11 +00:00
Treehugger Robot
6aac1cba28 Merge "Clean up BT stack log level preference controller and tests" into main 2024-07-23 02:45:25 +00:00
Ram Peri
34152fae41 Merge "Robolectric upgrade" into main am: 71b2be5571 am: 119d1e9f43
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3185301

Change-Id: Ide8c2fe010260f3ae172c0b2537d6d879212b333
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-23 01:25:50 +00:00
Ram Peri
119d1e9f43 Merge "Robolectric upgrade" into main am: 71b2be5571
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3185301

Change-Id: I9469f534e375c589f0a7dbac20f185f61ae69295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-23 01:08:54 +00:00
Pajace Chen
7ec1355922 Merge "[BugFix] Fix the incorrect state for dockdefend on battery settings page" into main 2024-07-23 00:37:13 +00:00
Isaac Chai
8b1135e1c9 Merge "feat(color correction): Disable slider when not applicable" into main 2024-07-22 22:43:39 +00:00
Daniel Norman
20d2eabe35 Checks that prebundled categories contain only preinstalled contents.
Bug: 353888087
Test: atest AccessibilitySettingsTest
Test: manually check all prebundled services are still in their proper
      groups, even after installing an APK update
Flag: com.android.settings.accessibility.check_prebundled_is_preinstalled
Change-Id: I023db9c37d7990deb50c9eec516619f0a8db65b7
2024-07-22 21:42:59 +00:00
Isaac Chai
581fbc8dfa feat(color correction): Disable slider when not applicable
We received feedback that slider should be disabled when it's not
applicable, namely when it's off and when mode == gray scale.

Bug: 351920992
Test: Locally tested + unit tests
Flag: com.android.server.accessibility.enable_color_correction_saturation

Change-Id: I1162a501a797a1d2b30da76f0c75e5fdea3f61d2
2024-07-22 21:09:54 +00:00
Treehugger Robot
0dcf3ff102 Merge "[Dev options] Conditionally show Freeform toggle: Only display when freeform is NOT available by default on the device." into main 2024-07-22 20:34:19 +00:00
Alina Zaidi
9609216cb5 [Dev options] Conditionally show Freeform toggle: Only display when freeform is NOT available by default on the device.
Previously Freeform Toggle was a no-op when freeform was by default available on devices

On the other hand Desktop mode toggle is displayed only when freeform IS available by default on the device. (This is because desktop mode support is tied to devices with default freeform capability.)

Also update toggle strings for a clearer user experience

Test: Updated tests
Bug: 348193756
Bug: 348186127
Flag: com.android.window.flags.show_desktop_windowing_dev_option
Change-Id: I29e36a939db78010bb3153e756f95bb6c21a31f9
2024-07-22 18:11:14 +00:00
Ram Peri
f5b58ea3be Robolectric upgrade
Test: atest SystemUIGoogleRoboRNGTests
Flag: TEST_ONLY
Change-Id: I833ac67223875480994f947907754290bb25c946
2024-07-22 13:48:09 -04:00
Joshua Mccloskey
bc726eda18 Merge "Refresh templates when fp removal fails" into main 2024-07-22 17:33:15 +00:00
Joshua McCloskey
f624d6adf7 Refresh templates when fp removal fails
Test: atest
Fixes: 339556796
Flag: EXEMPT bugfix
Change-Id: I369e37f170a57bc9ced98f9728d06f2072c01263
2024-07-22 17:33:03 +00:00
Matías Hernández
44c7272733 Final (?) touches to people/apps/sound circles
* Support comparing icon sets with a custom equivalence (needed because AppEntry doesn't implement equals(), and somewhat tricky because CircularIconPreference itself is not generic).
* Use final icons for allowed sounds.
* Use final appearance for +n icon.

Test: atest com.android.settings.notification.modes
Bug: 346551087
Flag: android.app.modes_ui
Change-Id: Iceadf4a182e607111afb72ff36bca872a62ae040
2024-07-22 17:06:38 +02:00
Matías Hernández
d8b9fe8f01 Show icons for allowed contacts
Test: atest com.android.settings.notification.modes
Bug: 346551087
Flag: android.app.modes_ui
Change-Id: If2b6b06b4a9c16bdefb03850ad1615e96c601fbd
2024-07-22 14:20:25 +02:00
Pajace Chen
c0c3b65c5c [BugFix] Fix the incorrect state for dockdefend on battery settings page
Bug: 348563863
Change-Id: Ie5f0f3e380b9355f96898eeddc755a18a71917a0
Test: Manual Test
Test: http://ab/I16200010297673244
Flag: EXEMPT bug fix
2024-07-22 08:22:32 +00:00
chelseahao
8dd7d1cc80 Add accessibility label for "QR code" button in Audio sharing page.
Test: atest
Bug: 354112158
Flag: com.android.settingslib.flags.enable_le_audio_sharing
Change-Id: I5d2e2c70ca76e3598ca3d9550ebcc140d3400e34
2024-07-22 14:19:06 +08:00
Joshua Mccloskey
2004df98f1 Merge "Too short error message on CDC is no longer red." into main 2024-07-19 21:38:01 +00:00
Matías Hernández
8ae1067818 Merge "Show icons for allowed sounds" into main 2024-07-19 17:06:27 +00:00
Matías Hernández
352100397f Show icons for allowed sounds
(Some icons are temporary, until we get the final assets)

Also some fixes/improvements to CircularIconsPreference:
* Show the correct placeholder and +N icons.
* Fix the displayIcons-before-measure case (global layout listener was incorrect).
* Properly cancel pending image load futures (field didn't point to the actual future).
* Don't reload icons if it's the same set (depends on equals() for the items, so unfortunately doesn't work for AppEntry yet).

Test: atest com.android.settings.notification.modes
Bug: 346551087
Flag: android.app.modes_ui
Change-Id: I9d029a5fdd785ada4e2ba4d8a90eba72b5fb9085
2024-07-19 15:30:45 +00:00
Matías Hernández
bc0b3342bd Merge "Show icons for apps bypassing DND" into main 2024-07-18 11:54:51 +00:00
Matías Hernández
0ebc865c5e Show icons for apps bypassing DND
(Several things pending, such as the +n icon and the correct pending icons, but it's a start).

Test: atest com.android.settings.notification.modes
Bug: 346551087
Flag: android.app.modes_ui
Change-Id: Ifd2ab6a8bb447739dc8ffe400c3960779d477fd6
2024-07-18 11:59:06 +02:00
Treehugger Robot
770917dc6b Merge "Fix whenNoInstaller_notDisplayed" into main 2024-07-18 06:17:42 +00:00
Treehugger Robot
2e3e6d69e8 Merge "Add wait for title_displayed" into main 2024-07-18 04:39:30 +00:00
Chaohui Wang
9187f1fd7d Add wait for title_displayed
Bug: 346420411
Flag: EXEMPT test only
Test: atest BackgroundInstalledAppsPageProviderTest
Change-Id: I8047cd0aa4e414df83bcc69ebf21f245f985b447
2024-07-18 11:51:51 +08:00
Chaohui Wang
512141619d Fix whenNoInstaller_notDisplayed
Which is forgot to update in Icd5559bce06c059844269d70926b3c0b39589edb

Bug: 346420411
Flag: EXEMPT test only
Test: atest AppInstallerInfoPreferenceTest
Change-Id: If21215b81008c03a6b6ad2a77a90073a6d708390
2024-07-18 11:39:13 +08:00
Chaohui Wang
dcc60f0371 Update FakeFeatureFactory
Return null for getSurveyFeatureProvider, since this will be called by
SurveyMixin during test.

Bug: 346420411
Flag: EXEMPT test only
Test: atest ResetNetworkConfirmTest
Change-Id: I7d0fab039bf96a2ef453e35dcf88cbdb77f01523
2024-07-18 11:22:18 +08:00
Joshua McCloskey
d11b1dc739 Too short error message on CDC is no longer red.
Test: atest ChooseLockPasswordTest
Fixes: 325097409
Flag: none
Change-Id: I09f910eeb28d117f6a5008d64b8d3eb5a1731800
2024-07-17 17:00:29 +00:00
Treehugger Robot
ee83f6a5d7 Merge "Tests - Add mandatory biometric prompt to platform surfaces (1/N)" into main 2024-07-17 15:37:02 +00:00
Chaohui Wang
371e7b09e1 Clean up WifiPrimarySwitchPreferenceController
This one is not used any more.

Bug: 167474581
Flag: EXEMPT clean up
Test: m Settings
Change-Id: Ia2439af2b3a6b643f41f6e3fce9e4bf1126c282e
2024-07-17 16:02:40 +08:00
Chaohui Wang
fb0583404f Always set cross sim calling
By CrossSimCallingViewModel, in SIMs and per SIM settings page.
To ensure the status is always right, including the case after the
onboarding set up finished.

Fix: 347882381
Fix: 348529996
Flag: EXEMPT bug fix
Test: manual - turn on / off "Automatic data switching" on SIMs
Test: manual - turn off "Automatic data switching" during onboarding
Change-Id: Icc2eacb67850fa7b3aa0fe310cd09a0e0147912b
2024-07-16 17:46:23 +08:00
Matías Hernández
d133ec93ab Merge "Distinguish the profile of DND-bypassing apps" into main 2024-07-16 09:15:54 +00:00
Matías Hernández
da3ae255e3 Distinguish the profile of DND-bypassing apps
Bug: 353273192
Test: atest ZenModeAppsLinkPreferenceControllerTest ZenModesSummaryHelperTest
Flag: android.app.modes_ui
Change-Id: I31d8836dbba38d04c9ab3b3180025cb8ddcfbe6d
2024-07-16 08:59:53 +00:00
Yiyi Shen
9eaf954e19 Merge "Fix dup preference key on Connected devices page" into main 2024-07-16 02:45:44 +00:00
Treehugger Robot
f1cd781ed1 Merge "Move PreferenceControllers to member variables to prevent memory leak" into main 2024-07-15 22:41:43 +00:00
Diya Bera
2348fefd48 Tests - Add mandatory biometric prompt to platform surfaces (1/N)
Tests for ag/27400418

Flag: android.hardware.biometrics.Flags.MANDATORY_BIOMETRICS
Bug: 339910718
Test: atest FingerprintSettingsFragmentTest ChooseLockGenericTest CombinedBiometricProfileSettingsTest

Change-Id: Ief7fca5d0b695d23d490b6302dea11bab6030fce
2024-07-15 22:26:50 +00:00
Chun-Ku Lin
ec61f8bea3 Move PreferenceControllers to member variables to prevent memory leak
- Move PreferenceControllers to xml
- Clean up the PreferenceController so that it's less tied to a fragment
- Update and clean up the related robolectric test, so there are less
  mocks needed

Bug: 352606511
Test: manually check the Color Correction screen is shown correctly, and
choosing color correction options are reflected correctly
Test: atest DaltonizerRadioButtonPreferenceControllerTest
Test: atest ToggleDaltonizerPreferenceFragmentTest
Flag: EXEMPT (moving controller to xml can't be flagged)

Change-Id: I89b9366cfd7a398bb0572d34226d31d49373fd94
2024-07-15 21:34:14 +00:00
Pat Manning
c8c8c53760 Merge "Update Touchpad settings page to include mouse." into main 2024-07-15 10:52:10 +00:00
Treehugger Robot
2db5d1618f Merge "Show less secure warning in Network details settings" into main 2024-07-15 08:00:42 +00:00
Weng Su
05b28d24c3 Show less secure warning in Network details settings
- Show warning when device connected to WEP protocol

Bug: 331973632
Flag: EXEMPT bugfix
Test: Manual testing
atest -c WepLessSecureWarningControllerTest

Change-Id: I54a9bafb2c672db44d47259d6acc49c02046cb81
2024-07-15 14:51:25 +08:00
Chaohui Wang
02849149de Merge "Revert^2 "Support search "Mobile data""" into main 2024-07-15 05:35:40 +00:00
Vincent Wang
8d235a2fc8 Merge "Remove package biometric2 from AOSP settings" into main 2024-07-15 05:00:06 +00:00
Chaohui Wang
cacc9a88b2 Revert^2 "Support search "Mobile data""
This reverts commit 979de75952.

Reason for revert: Failed CarDeveloperOptions tests fixed.

Change-Id: Ic0bdf47ab3cb40dbadebb738c0c5842e4e1bf9c8
2024-07-15 02:03:06 +00:00