Commit Graph

23235 Commits

Author SHA1 Message Date
Xinyi Mao
700f7e9ab2 Merge "Take as Unrestricted Mode in the UI if current Mode is Unknown." into main 2024-10-16 05:58:28 +00:00
Jacky Wang
c04e468bd4 Enable catalyst test for NetworkDashboardScreenTest
Bug: 368355361
Flag: EXEMPT test only
Test: atest NetworkDashboardScreenTest
Change-Id: I06630abf88f833e69e4d28419f3ba9f6a2a355f3
2024-10-16 12:19:17 +08:00
Treehugger Robot
c0b6e0bd4b Merge "[Catalyst] Vibration and haptics screen migration" into main 2024-10-16 00:43:14 +00:00
Jacky Wang
49677b7af2 Merge "[Catalyst] Network and Intenet screen migration" into main 2024-10-15 13:26:29 +00:00
Treehugger Robot
d5758d60d7 Merge "Fix flaky tests due to shared system property" into main 2024-10-15 12:09:31 +00:00
Jacky Wang
3ab6b197a9 Fix flaky tests due to shared system property
The system property is shared within JVM, change system property in a
test case might break test cases in another test class. To address the
issue, introduce SystemProperty helper class to back up and restore the
system properties in tests.

Bug: 373177618
Flag: EXEMPT Test only
Test: atest SettingsRoboTests
Change-Id: I15539ce5ac425f35571d796baa25f259df1b601f
2024-10-15 19:08:30 +08:00
Jason Chiu
9c9c0a3d94 [Catalyst] Network and Intenet screen migration
- Add a flag for the migration
- Add the skeleton of the screen

Test: atest NetworkDashboardScreenTest
Bug: 368355361
Flag: com.android.settings.flags.catalyst_network_provider_and_internet_screen
Change-Id: I37622d318f2a52a7c60c9fa965b94fd135ce0b60
2024-10-15 18:32:31 +08:00
mxyyiyi
7bfa060c5f Take as Unrestricted Mode in the UI if current Mode is Unknown.
- Battery usage mode MODE_UNKNOWN is (1) apps in allowlist and (2) app's OP_RUN_ANY_IN_BACKGROUND = MODE_IGNORED.
For this case, mode should be displayed as Unrestricted on UI since it is in allowlist; and should be logged as unknown mode for the potential compatibility issues.

- After Backup & Restore, the MODE_UNKNOWN will be reset to Optimized(Default) Mode on target device.

Bug: 372831500
Test: manual
Test: atest BatteryOptimizeUtilsTest
Test: atest AppOptModeSharedPreferencesUtilsTest
Flag: EXEMPT for simple fix
Change-Id: Ic18e026f71a4a50ffa1711e2ca0782aeb8b33076
2024-10-15 15:53:29 +08:00
Mill Chen
b923194def [Catalyst] Vibration and haptics screen migration
- Add a flag for vibration and haptics migration
- Add skeleton of vibration and haptics

Bug: 368360218
Test: atest VibrationIntensityScreenTest
Flag: com.android.settings.flags.catalyst_vibration_intensity_screen
Change-Id: I0117f570fe9bf92e61974984d00c0bd5be684fff
2024-10-15 04:44:09 +00:00
Yiling Chuang
fd699a753f Merge "Migrate Battery Saver" into main 2024-10-15 03:05:18 +00:00
Andy Wickham
51a8a098a5 Merge "Move Contextual Search setting to AOSP." into main 2024-10-15 00:47:04 +00:00
Shaowei Shen
6656d59ddf Merge "[Physical Keyboard] Add main page for Repeat keys" into main 2024-10-14 15:32:38 +00:00
Geoffrey Boullanger
d7f7417a1e Merge "Updated toggles in Date and time settings page" into main 2024-10-14 09:47:00 +00:00
Chaohui Wang
da37ff068d Merge "Fix PhoneNumberPreferenceControllerTest" into main 2024-10-14 09:39:32 +00:00
Sunny Shao
01ad71bc89 Migrate Battery Saver
Add the skeleton of the Battery Saver

Test: atest BatterySaverScreenTest
Bug: 368359126
Flag: com.android.settings.flags.catalyst_battery_saver_screen
Change-Id: I05a694c34468c01e4e032275567acbf37615c6f0
2024-10-14 17:34:10 +08:00
Treehugger Robot
dc8ed36f47 Merge "Ignore catalyst test in DisplayScreenTest" into main 2024-10-14 05:50:27 +00:00
shaoweishen
cbe75928d9 [Physical Keyboard] Add main page for Repeat keys
Page markup: https://screenshot.googleplex.com/5xCd2wVVyXajdCB.png

Test: atest SettingsRoboTests
Bug: 345399212
Flag: com.android.input.flags.keyboard_repeat_keys
Change-Id: Ie60f4b6ea4de973644103c0aa0bcdfe9a1e758eb
2024-10-14 05:28:41 +00:00
Chaohui Wang
44527db356 Fix PhoneNumberPreferenceControllerTest
Fix: 373247298
Flag: EXEMPT test only
Test: atest PhoneNumberPreferenceControllerTest
Change-Id: Ied4c46beca9130ea2db469e3f5dfe708c84b7373
2024-10-14 13:24:37 +08:00
Jacky Wang
44dfbe6748 Ignore catalyst test in DisplayScreenTest
Bug: 373177618
Bug: 368359268
Flag: EXEMPT fix test
Test: atest
Change-Id: I8de8468f53f4b9ec2c66e8e836bf9cf9072e6e63
2024-10-14 12:55:45 +08:00
Treehugger Robot
0a66344051 Merge "Connect to OWE Wi-Fi network when QR code has no password" into main 2024-10-14 03:52:39 +00:00
Weng Su
efe8d52f77 Connect to OWE Wi-Fi network when QR code has no password
- Since there is no password for Wi-Fi security in OPEN and OWE, try to connect to one of them

Bug: 360377330
Flag: EXEMPT bugfix
Test: Manual testing
atest -c WifiDppQrCodeScannerFragmentTest

Change-Id: Ia0a59e099b724170ad993df8b4246b94e0da392c
2024-10-14 07:02:18 +08:00
Jacky Wang
6324c21d86 Merge changes from topic "catalyst" into main
* changes:
  [Catalyst] Use hybrid mode for sound screen
  [Catalyst] Use hybrid mode for display screen
  [Catalyst] Support hybrid mode
2024-10-13 14:28:16 +00:00
Candice Lo
5f5e7b7b73 Merge "Make Extra Dim main toggle and shortcut searchable" into main 2024-10-13 12:54:35 +00:00
Jacky Wang
d38549d60b [Catalyst] Use hybrid mode for sound screen
Bug: 360015496
Flag: com.android.settings.flags.catalyst_sound_screen
Test: atest SoundScreenTest
Change-Id: Ifd685f8e3a546e8750a593201362540f60a3c031
2024-10-12 16:38:31 +08:00
Jacky Wang
92ce82809e [Catalyst] Use hybrid mode for display screen
Bug: 368359268
Flag: com.android.settings.flags.catalyst_display_settings_screen
Test: atest DisplayScreenTest
Change-Id: I5eed12ee5c596bee4c21c6e3aa9f3db0e0227bff
2024-10-12 16:38:31 +08:00
Wenyu Zhang
59dd884069 Merge "Use media switcher dialog to control routing during call" into main 2024-10-11 22:07:26 +00:00
Geoffrey Boullanger
b2dd2e3203 Updated toggles in Date and time settings page
Design doc: go/dd-android-settings-time-2024

Changes:
- toggling off "automatic time zone" now sets "use location" off and makes it unmodifiable
- removing "use locale default" for time format

Bug: 296835792
Test: on-device and atest
Flag: com.android.settings.flags.revamp_toggles
Change-Id: I31744f104fed06ee9980a6a0160501325175a02d
2024-10-11 17:24:47 +00:00
Candice
2e914a311f Make Extra Dim main toggle and shortcut searchable
Since the Extra Dim main toggle and shortcut preferences are created in
codes, we override `getRawDataToIndex` to return the corresponding index raw data.

Bug: 354778552
Test: atest ToggleReduceBrightColorsPreferenceTest
Test: Manually check the preferences are searchable in Settings search
Flag: com.android.settings.accessibility.fix_a11y_settings_search
Change-Id: I1642e96273cd16f35b23350af0ede3b1247ef067
2024-10-11 16:54:53 +00:00
Treehugger Robot
145bbb1638 Merge "Fix BatterySaverScheduleRadioButtonsControllerTest" into main 2024-10-11 12:00:19 +00:00
Treehugger Robot
f7d9c87ac7 Merge "Sound screen migration" into main 2024-10-11 07:36:58 +00:00
Tom Hsu
9832fe9281 Avoid test flaky
flag: EXEMPT bugfix
fix: 365673174
Test: atest passed
Change-Id: Id7c3747eafff3410ab899716d0c6e35eb405c76e
Merged-In: Id1290e6979fdafa93ded6f50e49d6b3464a80b50
2024-10-11 05:15:14 +00:00
Mill Chen
29036fd2a9 Sound screen migration
- Add a flag for sound and vibration migration
- Adding skeleton of sound screen

Bug: 360015496
Test: atest SoundScreenTest
Flag: com.android.settings.flags.catalyst_sound_screen
Change-Id: Id3a51663d3c1203be0046d12b312c5b64dc26683
2024-10-11 04:00:17 +00:00
Wesley Wang
ae4ec175c9 Fix BatterySaverScheduleRadioButtonsControllerTest
Test was failing because it was not setting the EXTRA_LOW_POWER_WARNING_ACKNOWLEDGED setting.

Change-Id: Id9e95c0240908dafbaa791e7f4f4b9ded9d39d9b
Test: atest BatterySaverScheduleRadioButtonsControllerTest
Bug: 370883745
Fix: 370883745
Flag: EXEMPT for simple bug fix
2024-10-11 02:54:38 +00:00
Chaohui Wang
3dc4d36a75 Merge "Disable the phone number when no subscription" into main 2024-10-11 02:53:50 +00:00
Treehugger Robot
5a1383886e Merge "mouse: Add preference toggle for Mouse swap primary button" into main 2024-10-10 23:25:35 +00:00
Treehugger Robot
bb5896b08d Merge "Mouse: Add preference toggle for mouse reverse vertical scrolling" into main 2024-10-10 20:32:27 +00:00
Kenneth Ford
476cd46b76 Update Settings tests to new DeviceStateManager API
Updates tests that use PosturesHelper to return both
the correct configuration values as well as the values
returned through the DeviceStateManager APIs

Flag: android.hardware.devicestate.feature.flags.device_state_property_migration
Bug: 336640888
Test: atest SettingsRoboTests
Change-Id: I23e7446de719f11c99a4f747e189e11405b203ef
2024-10-10 19:33:55 +00:00
Yiyi Shen
ae24d51b1b Merge "[Audiosharing] Save user preferred primary headset to SettingsProvider" into main 2024-10-10 08:28:46 +00:00
Chaohui Wang
8aeca8e755 Disable the phone number when no subscription
To align with SIM status, if no sim in this slot, show "Not available"
and disable instead.

Fix: 333386151
Flag: EXEMPT bug fix
Test: manual - on about phone
Test: unit test
Change-Id: I5053863cc69ff468036df87a8c87447ab0c2aaed
2024-10-10 14:49:23 +08:00
Wenyu Zhang
830654aa85 Use media switcher dialog to control routing during call
When input routing is enabled and in desktop devices, allow use media
switcher dialog to control routing during call.

Change-Id: Id2587a1d33783a02a84cdc5c850b0a9c7908f159
Bug: b/355684672, b/357123258
Test: atest MediaOutputPreferenceControllerTest
Flag: com.android.media.flags.enable_audio_input_device_routing_and_volume_control
2024-10-10 02:23:23 +00:00
Jimmy
449f4eeebc mouse: Add preference toggle for Mouse swap primary button
Bug: 359349392
Bug: 352598211
Test: Local DUT with aconfig flags enabled, verified settings
      appeared and swaps the mouse primary button

Flag: com.android.hardware.input.mouse_swap_primary_button

Change-Id: Ib762240c10e2cadcfa4a23cd78df81fcad8197dd
2024-10-09 19:30:15 +00:00
Jimmy
ff275c82aa Mouse: Add preference toggle for mouse reverse vertical scrolling
Bug: 359349392
Bug: 352598211
Test: Local DUT with aconfig flags enabled, verified settings appears
and is togglable. Verified toggle affects mouse scroll direction.

Flag: com.android.hardware.input.mouse_reverse_vertical_scrolling

Change-Id: I9620ac9bd33da7660c7a53f969426becc4f283cc
2024-10-09 19:29:10 +00:00
Andy Wickham
9f9571a078 Move Contextual Search setting to AOSP.
This only appears if the correpsonding system feature is enabled.

Bug: 353715553
Test: Manual
Flag: EXEMPT moving code from vendor to aosp
Change-Id: Ib19db6345b907500dfe3d53c36700df428c0171e
2024-10-09 18:32:21 +00:00
Treehugger Robot
e875a191ba Merge "[Physical Keyboard] Add Repeat key toggle" into main 2024-10-09 15:47:13 +00:00
shaoweishen
cffb21b17f [Physical Keyboard] Add Repeat key toggle
Add repeat key toggle under Physical keybaord setting.

Bug: 345399212
Test: atest SettingsRoboTests
Flag: com.android.input.flags.keyboard_repeat_keys
Change-Id: Ib986301d108b1ad30d96d7309189e9507d38c25a
2024-10-09 14:38:55 +00:00
Jean Chen
ec13a519ea Merge "Makes Use Color correction and Color correction shortcut searchable." into main 2024-10-09 12:08:04 +00:00
Treehugger Robot
30526d9858 Merge "Also clear the foreground service usage time for BatteryDiffEntry should hide background usage time." into main 2024-10-09 09:48:10 +00:00
Yiyi Shen
96429c6589 [Audiosharing] Save user preferred primary headset to SettingsProvider
In hysteresis mode, we will receive plenty of onReceiveStateChanged, e.g. play and pause music, system sounds... The onReceiveStateChanged with BIS >= 1, as a replacement of onSourceAdded, will trigger auto pick logic for primary headset. In some cases, when user change primary headset in Call audio section on audio sharing page under the hysteresis mode, the system sound will later trigger a onReceiveStateChanged with BIS >= 1, then the auto pick logic (always pick the earliest connected headset) is possible to override the user change. Thus here we have to save the user preferred primary headset in SettingsProvider and skip the auto pick if user has made changes.

Test: atest
Bug: 355222285
Flag: com.android.settingslib.flags.audio_sharing_hysteresis_mode_fix
Change-Id: I5ccf743eb685509ffcc3c7a88051726c10fe2567
2024-10-09 16:57:07 +08:00
Yiyi Shen
c349422e55 Merge "[Audiosharing] Update audio sharing section title in call" into main 2024-10-09 07:38:45 +00:00
chenjean
0ac1ba5920 Makes Use Color correction and Color correction shortcut searchable.
Fix: 354079305
Flag: com.android.settings.accessibility.fix_a11y_settings_search
Test: atest ToggleDaltonizerPreferenceFragmentTest
Test: adb shell pm clear com.google.android.settings.intelligence;
      search Settings for 'use color correction' & 'color correction shortcut', observe 'use color correction' & 'color correction shortcut' present;
Change-Id: I0fd1885c1e82ac14290dfe40636e652a624e003a
2024-10-09 14:17:06 +08:00