Commit Graph

2641 Commits

Author SHA1 Message Date
Zoey Chen
2fe1e08b43 [ToA] Do not use spy context
Test: atest TermsOfAddressFeminineControllerTest
Test: atest TermsOfAddressNeutralControllerTest
Test: atest TermsOfAddressNotSpecifiedControllerTest
Test: atest TermsOfAddressMasculineControllerTest
Bug: 339543490
Change-Id: I28c37db07b34b9da225f9d358159bc9064046b68
2024-05-15 14:47:34 +00:00
Jigar Thakkar
72089c3289 Rename settings option for autolocking on inactivity
Bug:328016823
Test: atest AutoLockPreferenceControllerTest
Flag: ACONFIG android.multiuser.support_autolock_for_private_space NEXT

Change-Id: Id4537efe5ac56df0fc98cef3ce6673a0673e0fba
2024-05-15 14:03:15 +00:00
Treehugger Robot
bb81d76744 Merge "Ignore test case with InitializationError" into main 2024-05-15 12:11:33 +00:00
Fan Wu
9c03ecfd97 Ignore test case with InitializationError
See this run for example:https://android-build.corp.google.com/test_investigate/?invocationId=I49700010276869184&testResultId=TR14429303618451319

Bug: 340657656

Test: atest
Change-Id: I89815f40ac8f3fedb0ddd2127e12412ff2dd7fce
2024-05-15 11:08:06 +00:00
SongFerng Wang
bbc605efd0 Merge "Fix search indexed the item from the invisible sim" into 24D1-dev am: 365cc18c40
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27341396

Change-Id: Ibecc4037975cc50636daecb18b243a1a5183f3fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-15 07:17:08 +00:00
Fan Wu
4fc959d8c1 Ignore LinkifyUtilsTest to investigate on ClassNotFoundException
Bug: 340657656

Test: atest
Change-Id: I7837b5eead0e58f47719cd250b3270cd344c3e59
2024-05-15 03:59:05 +00:00
songferngwang
6f8cc6f0b6 Fix search indexed the item from the invisible sim
When search start to index and run to MobileNetworkSettings.java, the
TelephonyBasePreferenceController will find which subId can be the
"AVAILABLE" from the active subscriptionInfo list. This active subscriptionInfo
list does not be filtered, so the search uses the invisibile sim's item for user.

Bug: 335509130
Test: atest MobileNetworkUtilsTest (pass)
Change-Id: I2840e7de344347643197592e125f5524d27a068e
2024-05-14 15:04:02 +00:00
Joshua McCloskey
0336781be0 UDFPS Enrollment Refactor (4/N)
Accessibility + text/dpi change + rotation should be properly handled.
Debug repos were added to make UI developemnt for UDFPS much easier(not
requiring calls to fingerprint manager).

Change-Id: I89900cea0d9e953124781cdf308fb38858de5d16
2024-05-13 22:05:26 +00:00
Treehugger Robot
7b4b26b3af Merge "[Thread] fix flaky Thread settings tests" into main am: 5a7eeea1e1 am: 0b6c1a781a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3081385

Change-Id: I45f9dc9a23cd804f311124c90ac612d7b2efa780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-13 10:02:30 +00:00
Kangping Dong
253be810ae [Thread] fix flaky Thread settings tests
This fix the flaky issue by using the directExecutor()

Bug: 340148095
Change-Id: Ib0ed0f660828ec3c2601b4fc0b3360e891eb48af
2024-05-13 16:14:56 +08:00
Fan Wu
67541a9444 Merge "Ignore existing failed tests and promote SettingsUnitTests to Presubmit. Exclude a few tests from Presubmit as they are failing in Presubmit but can pass locally." into main 2024-05-11 05:28:39 +00:00
Fan Wu
f44ea077d6 Ignore existing failed tests and promote SettingsUnitTests to Presubmit. Exclude a few tests from Presubmit as they are failing in Presubmit but can pass locally.
Bug: 339533415

Test: atest and presubmit
Change-Id: Icdc94195f3b4dda4e523d4b7498698a5ada198ea
2024-05-11 01:37:13 +00:00
Chaohui Wang
59e2bce852 Merge "Fix empty network scan result" into main 2024-05-10 12:03:26 +00:00
Manish Singh
544f85c262 Merge "Move mock init before fragment is created" into main 2024-05-10 11:50:05 +00:00
Treehugger Robot
2d4ef85b2f Merge "[Thread] fix Thread unit test failures" into main am: bb5bb304aa am: fc2d8c650f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3081467

Change-Id: I62d9d558c43a610daea3d0628488a3699568d60e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-10 10:58:34 +00:00
Mill Chen
f5ad0734a7 Merge "Deprecate Settings panels and its infrastructure" into main 2024-05-10 10:02:51 +00:00
Manish Singh
7b5c1bf766 Move mock init before fragment is created
Bug: 336518132
Test: atest PrivateSpaceDeletionProgressFragmentTest
Change-Id: Ic7d81e59515ad9ad1a354fff8884133e7cc8ea64
2024-05-10 09:11:49 +00:00
Kangping Dong
257e164562 [Thread] fix Thread unit test failures
It looks like SettingsUnitTests is not in presubmit and the existing Thread settings unit tests are failing in postsubmit.

This commit fixes two small issues:
1. The default Thread enabled state in FakeThreadNetworkController and ThreadNetworkToggleController is not consistent
2. The executor in ThreadNetworkToggleControllerTest is reusing the main thread which could result in flaky as the callbacks are not guaranteed to be invoked before the API returns

Bug: 339767488
Bug: 339145155
Test: atest SettingsUnitTests:com.android.settings.connecteddevice.threadnetwork.ThreadNetworkToggleControllerTest
Change-Id: Id8b453cf6d7bef698d08dbf106e48250369d0832
2024-05-10 17:10:50 +08:00
Chaohui Wang
6e4ac4bdc0 Fix empty network scan result
Settings use TelephonyScanManager.NetworkScanCallback to scan, and its
onComplete() could happens before onResults().

We will change Settings to fix.

Fix: 338986191
Test: manual - on NetworkSelectSettings
Test: unit test
Change-Id: If41d957f916a99eacc1becb6b460e58722a4dca7
2024-05-10 16:19:40 +08:00
Chaohui Wang
e216fd4248 No show DisableSimFooterPreference when sub not found
DisableSimFooterPreferenceController.getAvailabilityStatus() used to
return AVAILABLE when the subscription is not found in selectable
subscription info list.

Return CONDITIONALLY_UNAVAILABLE in this case to fix.

Bug: 336232487
Test: manual - on Mobile Settings
Change-Id: I88642fc9853ce6603a78dfdc0e5fed1da1553adc
2024-05-10 15:08:53 +08:00
Kangping Dong
da0be0f6f4 Merge "[Thread] update Thread settings screen" into main 2024-05-10 02:39:46 +00:00
Kangping Dong
ab7f48dcde [Thread] update Thread settings screen
Per b/327098435 the new Thread settings design proposed
(go/android-thread) is approved.

As a summary, this commit adds a new "connected devices > connection
preference -> Thread" list item and decidated config page for Thread.
Also, we simplified the airplane mode to delegate it to the mainline
code to handle it

Bug: 327098435
Test: atest SettingsUnitTests
Merged-In: Iffbb2471f5a28ec57d30a378f22642fe6ac0b9cc
Change-Id: Iffbb2471f5a28ec57d30a378f22642fe6ac0b9cc
2024-05-09 14:19:13 +08:00
Kangping Dong
d454ac2963 [Thread] update Thread settings screen
Per b/327098435 the new Thread settings design proposed
(go/android-thread) is approved.

As a summary, this commit adds a new "connected devices > connection
preference -> Thread" list item and decidated config page for Thread.
Also, we simplified the airplane mode to delegate it to the mainline
code to handle it

Bug: 327098435
Test: atest SettingsUnitTests
Change-Id: Iffbb2471f5a28ec57d30a378f22642fe6ac0b9cc
2024-05-09 14:04:52 +08:00
tomhsu
c0b39601bf Show dialog on Wifi, and APM' entries in Settings
- When satellite mode is switched on Wifi, and APM entry shall show the warning dialog and avoid user uses these functions.

Bug: 337154438
Test: Manual test.
Test: atest pass
Change-Id: I45cd92a8688e7a619613361ea4a8d58a0984d99f
(cherry picked from commit 29b2f16edf)
Merged-In: I45cd92a8688e7a619613361ea4a8d58a0984d99f
2024-05-08 05:40:36 +00:00
Tom Hsu
c495d92a25 Merge "Show dialog on Wifi, and APM' entries in Settings" into main 2024-05-08 04:37:28 +00:00
tomhsu
29b2f16edf Show dialog on Wifi, and APM' entries in Settings
- When satellite mode is switched on Wifi, and APM entry shall show the warning dialog and avoid user uses these functions.

Bug: 337154438
Test: Manual test.
Test: atest pass
Change-Id: I45cd92a8688e7a619613361ea4a8d58a0984d99f
2024-05-08 03:53:32 +00:00
Mill Chen
63742cabe4 Merge "Deprecated Wifi panel and relevant objects" into main 2024-05-08 01:28:15 +00:00
Mill Chen
42ef04eb80 Merge "Deprecate Nfc panel and relevant objects" into main 2024-05-08 01:27:49 +00:00
Mill Chen
cf28a1bd8e Merge "Redirect Volume Panel to settings page" into main 2024-05-07 23:58:33 +00:00
Wesley Wang
9b68d1b5fb Fix AppStateAppBatteryUsageBridge test fail
- Remove mock context to fix the component cast issue

Bug: 337417563
Fix: 337417563
Test: atest SettingsUnitTests
Change-Id: I2d375a4828d2a7b020f15535383c07e4f017bb84
2024-05-07 16:38:12 +08:00
Mill Chen
f6895743cf Deprecate Settings panels and its infrastructure
Bug: 328525899
Test: robotest
Change-Id: I30bc423e31e9202e70c509459f4397c296c8423f
2024-05-06 22:47:07 +00:00
Mill Chen
840aa5e40b Deprecate Nfc panel and relevant objects
Bug: 328528962
Test: robotest
Change-Id: Ia2acf4268e9a444d8b4cfe36c6eb2bd198f4be64
2024-05-06 22:27:02 +00:00
Mill Chen
4c061771b7 Deprecated Wifi panel and relevant objects
Bug: 328529085
Test: robotest
Change-Id: I960718acbdf1d2be6c3b6b396cf2ac69d4aa3046
2024-05-06 22:22:52 +00:00
Mill Chen
e4f785c773 Redirect Volume Panel to settings page
Flag: com.android.settings.flags.slices_retirement
Bug: 328529042
Bug: 202262476
Test: manual test
adb shell am start -a android.settings.panel.action.VOLUME

Change-Id: I54f30d18eb10db864dcf5ee745b168b03e388b14
2024-05-06 18:13:37 +00:00
Chaohui Wang
ffcbbd375a Clean up MobileNetworkSummaryStatus
Fix: 338904413
Test: m Settings
Change-Id: Ic26bf7833c8fbdbeffc4f47dcd6dcd6191394e1b
2024-05-06 07:26:06 +00:00
Treehugger Robot
b48c66ebea Merge "settings: Make use of ACTION_NETWORK_PROVIDER_SETTINGS" into main 2024-04-30 21:44:24 +00:00
Manish Singh
0f4d761d93 Merge "Don't send data for non-main users" into main 2024-04-29 11:51:46 +00:00
Rafael Higuera Silva
1d307afd95 Merge "Extract and fix logic for showing rac dialog." into 24D1-dev am: 958b737fcc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27072479

Change-Id: I9f5c4c8dea3c7aebc73b5121d6ace7aca22c1dfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-25 19:07:24 +00:00
Manish Singh
50b5bae531 Don't send data for non-main users
This is a regression caused by ag/26661827

Fix: 333872544
Test: manual
Test: atest PrivateSpaceSafetySourceTest
Change-Id: I0465899af3745fa39eab8806dbceb347d70b0aa3
2024-04-25 12:23:40 +00:00
Joseph Vincent
19d7d5be78 Merge "Mock LockPatternUtils.isSecure() method in test setup" into main 2024-04-25 11:53:15 +00:00
josephpv
6655fcd04e Mock LockPatternUtils.isSecure() method in test setup
Added mockd for LockPatternUtils class in test setup as per the comment
in b/323649600#comment7 to handle for the test failure bug.
The tests are passing locally without this.

Bug: 336518132
Test: atest com.android.settings.privatespace
Change-Id: Ie042bb7dd6edefef094d3b658946ff6eaaa6f801
2024-04-25 10:13:35 +00:00
Rafael Higuera Silva
36d99e8b09 Extract and fix logic for showing rac dialog.
Added tests to make sure the logic makes sense.

Bug: 335745726
Test: make, manual, atest SubscriptionUtilRoboTest, atest SubscriptionUtilTest, atest ResetNetworkTest
Change-Id: I7092f2747f1ca1f9ef4dc99275a916b9e24d8b28
2024-04-25 01:34:47 +00:00
David Jacobo
240b32fa91 settings: Make use of ACTION_NETWORK_PROVIDER_SETTINGS
This CL makes use of the newly introduced action for
NETWORK_PROVIDER_SETTINGS.

Bug: None
Test: atest -c ProviderModelSliceTest
Change-Id: Ie0ccde2f49502a634801401e1b33f1d4b9c7d728
2024-04-24 17:08:42 -07:00
Treehugger Robot
3d435c7283 Merge "Fix failure in BiometricsSafetySourceTest" into main 2024-04-24 08:35:59 +00:00
paulzhchen
5f391359e3 Reland add FeatureProvider for SyncAcrossDevices Settings integration.
Prior CL ag/26930404 was reverted because an unused class was
trimmed in AOSP, causing test cases to throw NoClassDefFoundError
exceptions. This CL combines ag/26930404 and ag/26995936 to address
the failure.

Bug: 330498032
Test: atest FakeFeatureFactory, atest SyncAcrossDevicesPreferenceControllerTest
Change-Id: I0a7ebccdebcad20e06d7542d7c4a0005885f393b
2024-04-24 02:02:35 +00:00
Elliot Sisteron
4fffb3ad64 Fix failure in BiometricsSafetySourceTest
Bug: 335886401
Change-Id: I07ce2a1f3b4938348c93208a35b1407960617917
Test: atest BiometricsSafetySourceTest
2024-04-23 10:57:47 +00:00
Pechetty Sravani
dbb7d1772b Merge "Revert "Add FeatureProvider for SyncAcrossDevices Settings integ..."" into main 2024-04-23 09:12:48 +00:00
Pechetty Sravani
ea26f2d729 Revert "Add FeatureProvider for SyncAcrossDevices Settings integ..."
Revert submission 26930404-syncacrossdevices

Reason for revert: Potential culprit for b/336431732- verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:26930404-syncacrossdevices

Change-Id: I9da0de82978fa6984a4636e0c9ccc891d9287fd2
2024-04-23 07:43:47 +00:00
Paulz Chen
319245cdbe Merge "Add FeatureProvider for SyncAcrossDevices Settings integration." into main 2024-04-22 23:52:23 +00:00
Elliot Sisteron
365c16b217 Reset SafetyCenterManagerWrapper instance between tests.
This is because some other tests may set a mock on this static value, which will persist across test cases (whereas in this test we want to test the real thing).

Bug: 335557039
Change-Id: I14fc81922761159241636c78dbd47fce7bfeb533
Test: atest SafetyCenterManagerWrapperTest
2024-04-22 14:49:57 +00:00