Commit Graph

21559 Commits

Author SHA1 Message Date
Xin Li
9bf082ae01 Merge "Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future" into aosp-main-future 2024-06-06 20:54:42 +00:00
Treehugger Robot
8c0d308276 Merge "Add Enable16KbTest to TEST_MAPPING" into main am: c3c33df4fc
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3111923

Change-Id: I374aa31dde3f310e30462e82422dca679274ebee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 16:47:02 +00:00
Treehugger Robot
c3c33df4fc Merge "Add Enable16KbTest to TEST_MAPPING" into main 2024-06-06 16:28:25 +00:00
Treehugger Robot
cd33904187 Merge "Fix test config" into main am: 4f19466f56
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3114506

Change-Id: I96194603f06e24effecbbf3f04cbea01e21e7c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 15:46:18 +00:00
Pawan Wagh
9021526247 Fix test config
test app was failing to install when running in integration due to
shared uid. Removing the sharedUid field from test.

Test: m Enable16KbTest && atest -c Enable16KbTest
Bug: 341995374

Change-Id: I37f481c552f8f0779bcd8c69cf4e40598590f5db
2024-06-05 23:02:50 +00:00
Xin Li
3c3a1cc6c6 Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future
Bug: 343100748
Merged-In: Id3d79805bb2289b84ad34ac05a97e50f0410502f
Change-Id: I70f531e800ed5f3765a100b5b5cecb99664c1dbc
2024-06-05 14:12:13 -07:00
Pawan Wagh
78cd8ba4f6 Merge "Integration tests for 16kb dev option" into main am: 3abf3a0f8c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3111722

Change-Id: I1a9980d2857017bfd3d6808561b020bfa35dd32d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 03:08:45 +00:00
Pawan Wagh
0dbc009db1 Add Enable16KbTest to TEST_MAPPING
Test: m Enable16KbTest && atest -c Enable16KbTest
Bug: 341995374
Change-Id: I92bf4a92dcb9fed4d4ae3cb35f6032b095a640d3
2024-06-04 23:12:39 +00:00
Pawan Wagh
10ff699b99 Integration tests for 16kb dev option
Adding tests to verify end to end functionality for dev options.
This test verifies
- /data reformatting to ext4
- switching to 16kb kernel
- switching back to 4kb kernel
- Persistent notifications in page-agnostic mode
- Disabling developer option in page-agnostic mode

Test: m Enable16KbTest && atest -c Enable16KbTest
Bug: 341995374
Change-Id: Ieaa149831b5205a15b259982f0349dc94d4fae92
2024-06-04 23:11:37 +00:00
Xin Li
f0e00b8bf7 Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550
Merged-In: I96574a79eba581db95d387f0d9c9fde2e004c41c
Change-Id: Ib9f2c742f8aa72651ef9eca80a716dd94b9041ea
2024-05-23 14:12:07 -07:00
Treehugger Robot
2fcc3a20e5 Merge "Update Setting's Robolectric tests' instructions" into main 2024-05-13 17:36:07 +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
Chun-Ku Lin
01463cac05 Update Setting's Robolectric tests' instructions
Test: N/A

Change-Id: I00a0b3ac910caaeb35f66762a9d67610b9180ff6
2024-05-11 02:29:57 +00:00
Treehugger Robot
bb5bb304aa Merge "[Thread] fix Thread unit test failures" into main 2024-05-10 10:18:40 +00:00
Chaohui Wang
51fe6894f9 Merge "Use permission com.android.settings.BATTERY_DATA" into main 2024-05-10 09:15:47 +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
Kangping Dong
ba221ea50c Merge "[Thread] update Thread settings screen" into main 2024-05-10 06:38:45 +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
Ang Li
f0e6f12f10 Adapt to the new API of ShadowCaptioningManager.
Test: Presubmit.
Change-Id: If90894a2438ff5e0aec8e727036f7a656f4c712a
2024-05-08 22:16:33 +00:00
Chaohui Wang
0887ee4540 Use permission com.android.settings.BATTERY_DATA
In SettingsSpaUnitTests

Change-Id: Ic1bec601e773389813bce4e7663ce08c41fa3deb
Fix: 338300477
Test: presubmit
Merged-In: I5a1753835d2d47712ea249081c9a77c455eb3291
2024-05-08 04:55:37 +00:00
Pawan Wagh
4795662e6a Merge "Show persistent notification for page-agnostic mode" into main 2024-05-07 02:13:53 +00:00
Pawan Wagh
a697fba513 Show persistent notification for page-agnostic mode
When device enters page-agnostic mode using 16KB developer
options, show notification to user using boot receiver and service.
On clicked on notification, show detailed instructions on how to
get back to production mode. Removing OEM carrier unlock allowed
condition.

Bug: 295035851
Bug: 338139755
Bug: 302600682
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Change-Id: Ib7a57af4c6151d2a8da1ec94130532d10b1679aa
2024-05-06 22:16:27 +00:00
Eric Biggers
790e28c431 Merge changes I20f2330d,Iaca5b20c into main
* changes:
  Remove unused class ShadowKeyStore
  Use KeyProperties.UID_SELF instead of KeyStore.UID_SELF
2024-05-06 17:36:00 +00:00
Eric Biggers
f56ead496e Remove unused class ShadowKeyStore
Since the class android.security.KeyStore is going away, remove the
unused test utility class ShadowKeyStore that references it.

(ShadowKeyStore was originally used by a test, but
https://r.android.com/1353609 deleted that test.)

Bug: 326508120
Test: build
Flag: TEST_ONLY
Change-Id: I20f2330dee171a0bfe860a1318dc2f962a80bd19
2024-04-25 19:46:54 +00:00
Jeff DeCew
1d4d5343cc Remove redundant call to SetFlagsRule.initAllFlagsToReleaseConfigDefault()
Change-Id: I1b628f9430cfdd4b1c12deb7e8f4345658f05ca8
Test: atest
Bug: 336802415
Flag: none
2024-04-24 16:56:31 +00:00
Jakub Rotkiewicz
c923103142 Bluetooth Codec Settings: Assure flag enabled
Assure flag a2dpOffloadCodecExtensibilitySettings is enabled before
calling BluetoothA2dp API.

Bug: 331612641
Tag: #feature
Test: atest SettingsRoboTests:com.android.settings.development.bluetooth.AbstractBluetoothListPreferenceController
Test: atest SettingsRoboTests:com.android.settings.development.bluetooth.BluetoothCodecListPreferenceControllerTest
Merged-In: Iac33a6c95a544230e034807b320c80a727ade307
Change-Id: I2b0ed6c7ac91401b958b206817aca55e0aa47170
2024-04-16 06:08:46 +00:00
Jakub Rotkiewicz
de27acef86 Refactor Bluetooth Codec settings to dynamic ListPreference
Fetch supported codecs from native and present to user using
ListPreference.

Bug: 305779598
Bug: 311451118
Bug: 323319530
Tag: #feature
Test: atest SettingsRoboTests:com.android.settings.development.bluetooth.AbstractBluetoothListPreferenceController
Test: atest SettingsRoboTests:com.android.settings.development.bluetooth.BluetoothCodecListPreferenceControllerTest

Merged-In: Iedbfd01c0d1b59df8a073f4e9aedca3913e6d45f
Change-Id: I90ed0d83c3250c64789e27707b0b7bff30043335
2024-03-21 11:06:18 +00:00
Wilson Wu
2ffd023d17 Fix keyboard vibration settings delay
The default settings observer delay is 10s for
background service. It cause the apps get the
settings update delay and lead a unsync behavior.

Update the settings change without delay.

Bug: 327094397
Test: Manual test with bug steps
Test: atest KeyboardVibrationTogglePreferenceControllerTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f2174611b8be192815f16e0ebc42eebfe3bfca0d)
Merged-In: Ib1c23ec9e1442e8397c7a36ffa157594ac64a9b3
Change-Id: Ib1c23ec9e1442e8397c7a36ffa157594ac64a9b3
2024-03-14 00:59:38 +00:00
Kangping Dong
08dd96fd8f [Thread] use dedicated flag for Thread settings
a larger THREAD_ENABLED_PLATFORM flag which guards all Thread-related
platform changes is used for the Thread settings change. But we need
more flexible control of the UX release timeline. So use a dedicated
THREAD_SETTINGS_ENABLED flag here.

Bug: 329384658
Change-Id: Ib5b3ae3c71ccc890fc46af982b021858774938f3
2024-03-13 18:28:45 +08:00
Wilson Wu
08308b2ee8 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
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fd45101eee85da95a3de8d4ce2bfd01824e282c3)
Merged-In: I3b4e06660e3eaa6ce537b72831073f092cba37e2
Change-Id: I3b4e06660e3eaa6ce537b72831073f092cba37e2
2024-03-07 20:54:55 +00:00
SongFerng Wang
71c6c3e557 Merge changes I96574a79,I74681222 into main
* changes:
  Fix the testcase failed
  Add the log for SidecarFragment
2024-03-04 12:27:37 +00:00
songferngwang
c9a3eeb792 Fix the testcase failed
Add mock for SubscriptionManager.createForAllUserProfiles

Bug: 323652989
Test: atest MobileNetworkPreferenceControllerTest
Change-Id: I96574a79eba581db95d387f0d9c9fde2e004c41c
2024-03-04 10:58:22 +00:00
SongFerng Wang
d94a556939 Merge "Fix SimDialogActivityTest" into main 2024-03-04 08:48:11 +00:00
Angela Wang
6089d3edd6 Merge "Replaces HearingDevicePairingDetail with HearingDevicePairingFragment" into main 2024-03-04 06:53:19 +00:00
Jacky Wang
16a99aecae Merge "[DataStore] Migrate BatteryBackupHelper to BackupRestoreStorage" into main 2024-03-04 03:58:29 +00:00
Weng Su
1a2d60a867 Merge "Ignore failed Wi-Fi unit tests" into main 2024-03-04 03:47:47 +00:00
Weng Su
777157b5b4 Ignore failed Wi-Fi unit tests
Bug: 323645528
Flag: None
Test: unit test
atest -c SettingsUnitTests:RequestToggleWiFiActivityTest \
         SettingsUnitTests:WifiDialog2Test \
         SettingsUnitTests:WifiUtilsTest

Change-Id: I8d3ddb1eb775b8758cb359cac4dac39bb9c8dfed
2024-03-04 06:07:40 +08: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
songferngwang
3f6d1dc3e5 Fix SimDialogActivityTest
Can't create handler inside thread

Bug: 323649089
Test: atest SimDialogActivityTest
Change-Id: I678a1a1841ab1e1cd87c358fbb3d52cbfb55dbe4
2024-03-02 14:45:47 +00:00
Chaohui Wang
bec4c9573e Create isSubscriptionEnabledFlow
To better display the isEnable checked state.

Bug: 318310357
Test: manual - on Mobile Settings
Test: unit test
Change-Id: Ia595e7445650ad67883f1e7c1a0662cb826565ea
2024-03-02 05:01:28 +00:00
Treehugger Robot
29e984b13a Merge "settings(dev): Remove NFC stack logging control" into main 2024-03-02 02:16:24 +00: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
Kangping Dong
830d4c0b1e Merge "[Thread] add Thread toggle in settings" into main am: 522e193947 am: abd5f23fe9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2909326

Change-Id: If086f510fe5d3b3f67b4f168f2e0d3f5e0ef98bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 18:25:13 +00:00
Roshan Pius
a5bd1cf34f settings(dev): Remove NFC stack logging control
We are now turning on verbose logging by default.

Bug: 327517842
Test: Compiles
Change-Id: I3c6026e230c7d35f04d9771442fadbf040a84b94
2024-02-29 09:44:37 -08:00