Commit Graph

23235 Commits

Author SHA1 Message Date
Treehugger Robot
05422458fe Merge "Merge 24Q3 (ab/AP3A.240905.015) to aosp-main-future" into aosp-main-future 2024-08-15 16:58:27 +00:00
Matías Hernández
195c698cdf Fix refresh of "apps that can interrupt" segment
Switching from Priority Apps to None would still show the icons of the priority apps. There were several minor things wrong:
* We were keeping the AppSession when a mode switches from "priority apps" to "none", and because onResume always fires the callback, we were loading the icons.
* Even when deactivating the session, its own onResume lifecycle listener was still firing one extra time, before we had a chance to deactivate it.

Also two minor improvements to CircularIconsPreference:
* Update mLoadedIcons when we early exit due to mIconSet having no items. Mostly for testing, since the icons wouldn't be visible anyway.
* Use notifyChanged() when we get a measured view, instead of holding a reference to the view. Technically the previous code violated the "shouldn't keep references to views outside of onBindViewHolder" (although I didn't see this having an effect in practice).

Fixes: 360077747
Test: atest ZenModeAppsLinkPreferenceControllerTest
Flag: android.app.modes_ui
Change-Id: I6d4b7a344542da46f5ebfcd0774f1af27ed113ac
2024-08-15 17:40:36 +02:00
Tetiana Meronyk
c8c5ac7be1 Merge "Read new value of admin status on UserCapabilities update" into main 2024-08-15 15:10:46 +00:00
Alexander Roederer
84cb2f6a02 Merge "Adds Zen metrics categories" into main 2024-08-15 14:39:45 +00:00
Haijie Hong
04f1fea990 Merge "Implement Spatial audio toggle domain layer" into main 2024-08-15 10:54:48 +00:00
Chaohui Wang
1951412dbe Create UiccSlotRepository
Also fix crash when TelephonyManager.uiccSlotsInfo returns array
contains null.

Fix: 358215954
Flag: EXEMPT bug fix
Test: manual - on Mobile Settings
Test: atest UiccSlotUtilTest
Change-Id: I4f92c9a43a430e295b6e048aee059416c46a256b
2024-08-15 08:27:34 +00:00
Haijie Hong
e3702e9b14 Merge "Rearrange bluetooth device details fragment according to config" into main 2024-08-15 08:13:11 +00:00
Xin Li
0b886fe303 Merge 24Q3 (ab/AP3A.240905.015) to aosp-main-future
Bug: 347831320
Merged-In: I54a12b03ed9be6dc49fb957df0f1f7b31647810d
Change-Id: I473577d5983daafb368afa5523bad948499cb9a2
2024-08-14 23:26:30 -07:00
Treehugger Robot
b9972035bb Merge "Avoid launching details settings after WifiEntry is forgotten" into main 2024-08-15 05:44:24 +00:00
Hakjun Choi
c887a26971 Filter out the satellite PLMNs from the current connected network
Filter out satellite PLMN if current connected network is satellite when user get into the manual select network menuIf Automatically select network is

Bug: 358429071
FLAG: EXEMPT bugfix
Test: manually test if satellite plmn is shown
Change-Id: I79aefc62e897319cae199985e9a63284086f6c2d
2024-08-15 04:23:59 +00:00
Weng Su
a6861564b5 Avoid launching details settings after WifiEntry is forgotten
- Don't launch details settings if WifiEntry isn't saved

Bug: 359584817
Flag: EXEMPT bugfix
Test: Manual testing
atest -c NetworkProviderSettingsTest

Change-Id: Iff1c37b64adef6d136d2aaa6a0a946c22af38193
2024-08-15 12:06:11 +08:00
Treehugger Robot
d3fc95aa14 Merge "Update icon picker options, sort order, and descriptions" into main 2024-08-15 01:40:07 +00:00
Treehugger Robot
b3d4b76c69 Merge "Add mandatory biometric prompt to platform surfaces (5/N)" into main 2024-08-15 01:11:42 +00:00
Daniel Norman
c38fd822ba Stops hiding a11y services with the same package+label as an activity.
Bug: 353700779
Test: atest AccessibilitySettings, ensure new test passes
Test: revert AccessibilitySettings.java change, ensure new test fails
Test: Install poc APKs from the bug, observe issue not reproducible
Flag: NONE security fix
Change-Id: Ie680e80169aa734f2559fe50ef06e4d1eae46779
2024-08-14 22:48:06 +00:00
Alexander Roederer
64593a873a Adds Zen metrics categories
Assigns metrics categories to all modes pages under
ZenModesListFragment. Includes new metrics categories where appropriate.

Bug: 332937635
Test: Build and flash
Flag: android.app.modes_ui
Change-Id: Ic19862ec194b40eae294d3c30240fe3f51304665
2024-08-14 20:27:13 +00:00
Matías Hernández
e1dbcfcdb8 Update icon picker options, sort order, and descriptions
Final icon list is ready!

Bug: 359171199
Test: atest IconOptionsProviderImplTest + manual
Flag: android.app.modes_ui
Change-Id: Ia46558fa320bbcc44d19fdda81b14773851a6060
2024-08-14 18:18:19 +00:00
Tetiana Meronyk
56446fa3b8 Read new value of admin status on UserCapabilities update
Before multiple admins were introduced, only main user could be an admin and that status was not modifiable. But now it can be updated for non-main admins of the device. So it is important to refresh this value to keep it up to date.

Bug: 359466920
Test: atest UserCapabilitiesTest
Flag: EXEMPT bugfix_only
Change-Id: If39ad24b10daf6886f402926b3bab23b50201c98
2024-08-14 15:44:35 +00:00
Treehugger Robot
afa281ce5b Merge "Get available channels allowed by Hotspot" into main 2024-08-14 15:03:56 +00:00
Haijie Hong
df2915bd4e Merge "Add owners for bluetooth settings test folder" into main am: 55834fff02 am: 61a2efc807
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3216259

Change-Id: Idd4a63bea7da0801e963d605d17b751643d1a9d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-14 10:48:35 +00:00
Haijie Hong
61a2efc807 Merge "Add owners for bluetooth settings test folder" into main am: 55834fff02
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3216259

Change-Id: I4835d1b33e1593892054224dec33ea79e64187dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-14 10:32:20 +00:00
Haijie Hong
6f38de4932 Add owners for bluetooth settings test folder
Change-Id: I1503db974eb271890486581d173c1bde8457f7df
2024-08-14 09:42:21 +00:00
Haijie Hong
c1b24f0a9e Implement Spatial audio toggle domain layer
BUG: 343317785
Test: atest SpatialAudioInteractorTest
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: Ic73e56a1ca41f9fa58d5219666478a7edc55059d
2024-08-14 17:23:14 +08:00
Weng Su
6c2158edef Get available channels allowed by Hotspot
- Use getAllowedChannels API instead of getUsableChannels API to avoid corner cases

Bug: 352267181
Flag: EXEMPT bugfix
Test: Manual testing
atest -c WifiHotspotRepositoryTest

Change-Id: I5ae4a4d429924ac2b8676bbbb27016a93ccd9a1b
2024-08-14 17:10:05 +08:00
Haijie Hong
41f7c222b6 Rearrange bluetooth device details fragment according to config
BUG: 343317785
Test: atest DeviceDetailsFragmentFormatterTest
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: I440f85b2c402920e851915ff56fa7b3f5356e807
2024-08-14 16:06:15 +08:00
josephpv
2f4c6f7b7a Removing TODO from test
In controller test, simulating profile with hideIndQuietMode set to true
in by mocking AppEntry is not possible. updateAppList() method is
assumed to already receive a filtered list of apps based on the
profile's quiet mode status which is called from onRebuildComplete().

Corresponding filters for this page has test in the underlying settingsLib ApplicationsStateTest file

Bug: 26013153
Test: Manual
Flag: EXEMPT only test file
Change-Id: I09ea3b279c40e0ee4806a80646a5dfcd3d3f784b
2024-08-13 22:34:22 +00:00
Yuri Lin
21ef302524 Merge "Add images for interstitial pages." into main 2024-08-13 22:25:40 +00:00
Yuri Lin
24ba675fe4 Add images for interstitial pages.
This change removes the custom rounding of corners, as the provided images already have rounded corners.

Bug: 332730534
Test: manual (light & dark mode, various font/display sizes)
Flag: android.app.modes_ui
Change-Id: I71d0707554e5bc638add6a2907874e18e833da08
2024-08-13 16:46:05 -04:00
Joshua McCloskey
882e1c3621 Split up FingerprintManagerInteractor
Test: atest, screenshot tests passed
Flag: com.android.settings.flags.fingerprint_v2_enrollment
Change-Id: I70833d5d9888f730233a9757589ce7faa45eccc9
2024-08-13 18:36:44 +00:00
Treehugger Robot
d91aed9009 Merge "[dev_option] Dismiss reboot dialog on screen rotation." into main 2024-08-13 17:26:14 +00:00
Diya Bera
92ea474b86 Add mandatory biometric prompt to platform surfaces (5/N)
1. For biometric settings, request biometric prompt only after
   successful credential verification and no auth request after
   enrollment

2. Differentiate between mandatory biometrics ineffective error and
   other biometric errors

Flag: android.hardware.biometrics.flags.mandatory_biometrics
Bug: 358176202
Bug: 358179610
Test: atest UtilsTest DevelopmentSettingsDashboardFragmentTest MainClearTest BuildNumberPreferenceControllerTest CombinedBiometricProfileSettingsTest
Change-Id: I778dd5403dd5ab64d8cc39bd88b22c4d39182e94
2024-08-13 04:21:37 +00:00
Chaohui Wang
544cf32491 Merge "Create ProvisioningRepository" into main 2024-08-13 04:14:42 +00:00
Xin Li
20fb15ea4b Merge "Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future" into aosp-main-future 2024-08-12 17:14:32 +00:00
Alina Zaidi
156798b168 [dev_option] Dismiss reboot dialog on screen rotation.
Bug: 356273849
Test: mp droid and locally checked that there are no errors and crashes
Flag: EXEMPT minor fix
Change-Id: Id60b304788bfb79fee13858c8e7bc30261f8e1c7
2024-08-12 16:09:03 +00:00
Haijie Hong
2a01b356ae Merge "Move rename button next to the device name" into main 2024-08-12 08:18:32 +00:00
Chaohui Wang
f245b3e04f Create ProvisioningRepository
Also check if has IMS feature before calling ProvisioningManager.

Bug: 358000881
Flag: EXEMPT refactor
Test: manual - on Mobile Settings
Test: atest ProvisioningRepositoryTest
Change-Id: I5fffff6c63af8c67d666b0e855f026633bb36651
2024-08-12 05:43:57 +00:00
Treehugger Robot
0373a46e81 Merge "Hide new Hotspot preferences if feature is disabled" into main 2024-08-12 04:55:54 +00:00
Haijie Hong
c2ed6d3242 Move rename button next to the device name
BUG: 343317785
Test: atest GeneralBluetoothDetailsHeaderControllerTest
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: I87f030ca48d3edac13759fe51499b7e400dbb795
2024-08-12 12:31:45 +08:00
Kai Zhou
c64611f30f Merge "Add unit test in WifiDppConfiguratorActivity" into main 2024-08-12 02:59:28 +00:00
Weng Su
675b817c49 Hide new Hotspot preferences if feature is disabled
- Hide new "Security" preference

- Hide new "Speed and compatibility" preference

Bug: 356898105
Flag: EXEMPT bugfix
Test: Manual testing
atest -c WifiTetherSettingsTest

Change-Id: I734959ed511929bfcc9a314770a4acdf9a7e0b99
2024-08-12 05:49:02 +08:00
Jason Hsu
c98fd48306 Merge "Flash Notifications color dialog crashs if configuration changes" into main 2024-08-10 08:03:32 +00:00
jasonwshsu
e08c1a5f92 Flash Notifications color dialog crashs if configuration changes
Root Cause:
When configuration changes, it will recreate fragment then call no args constructor which lead to null pointer exception for error passing parameters in getInstance().

Solution:
* Use setArguments() to pass parameters.
* Move settings key update action into fragment.
* Obsever settings key changes to update summary accordingly.

Bug: 349049233
Test: atest ScreenFlashNotificationColorDialogFragmentTest ScreenFlashNotificationPreferenceControllerTest
Flag: EXEMPT bugfix
Change-Id: Ided0853cf9a989e2f288a85c1aa709f71f7e1cd6
2024-08-10 10:24:30 +08:00
Treehugger Robot
6c3abd0bce Merge "Fix DoubleBraceInitialization errorprone issues" into main am: 05c4027843 am: d005b3250b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3214820

Change-Id: I0293acecd11dc3e93b0aa1c047204bee67192bad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-09 23:55:19 +00:00
Treehugger Robot
d005b3250b Merge "Fix DoubleBraceInitialization errorprone issues" into main am: 05c4027843
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3214820

Change-Id: I5b364535808594161ae0aa7fe6d2eb75149fdd77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-09 23:31:01 +00:00
Treehugger Robot
05c4027843 Merge "Fix DoubleBraceInitialization errorprone issues" into main 2024-08-09 23:12:10 +00:00
Cole Faust
2483b32069 Fix DoubleBraceInitialization errorprone issues
https://errorprone.info/bugpattern/DoubleBraceInitialization

Flag: EXEMPT refactor
Bug: 253827323
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: Idf52035a720f051a43553b53a89a37131d4e208b
2024-08-09 15:05:14 -07:00
Chaohui Wang
fa28c7a636 Merge "Reduce flaky of AppNotificationPreferenceTest" into main am: 422770ed1e am: 6d09b136d5
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3212002

Change-Id: I7255b69e79f7a970c2488d4bcf700c43f13ce40a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-09 07:11:25 +00:00
Chaohui Wang
6d09b136d5 Merge "Reduce flaky of AppNotificationPreferenceTest" into main am: 422770ed1e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3212002

Change-Id: If04a3e903a7fd151dd07004eba283f41df044ebe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-09 06:55:52 +00:00
Chaohui Wang
7380359520 Reduce flaky of AppNotificationPreferenceTest
Bug: 355413226
Flag: EXEMPT test only
Test: atest AppNotificationPreferenceTest
Change-Id: I1dfe4c5ae764941acb78e8fad52518963d1dad74
2024-08-09 05:33:27 +00:00
Jason Hsu
a60f80f4de Merge "Connected devices page did not show correct summary when member device connect" into main 2024-08-09 03:21:18 +00:00
Chaohui Wang
e880a15aeb Merge changes from topic "PreferredNetworkModeSearchItem" into main
* changes:
  Dual SIM search for Preferred network type
  Refactor MobileNetworkSettingsSearchIndex
2024-08-09 02:50:04 +00:00