Commit Graph

18702 Commits

Author SHA1 Message Date
Evan Chen
79e1918413 Merge "Add deviceId in AssociaitonInfo" into main 2024-11-27 21:06:08 +00:00
Azhara Assanova
76b535473d Merge "[AAPM] Update ActionDisabledByAdminDialog and ExternalSourcesDetails strings" into main 2024-11-27 10:45:34 +00:00
Azhara Assanova
47e665802b [AAPM] Update ActionDisabledByAdminDialog and ExternalSourcesDetails strings
The new advanced protection support intent will be launched by the
existing ActionDisabledByAdminDialog if the enforcing admin of a certain
restriction is advanced protection. To determine that, Change-Id
If931dcddad508f88aac1280b587da4767b937875 introduces an API to query the
enforcing admin.

In addition, this change updates ExternalSourcesDetails to display
a disabled by advanced protection string in the preference summary.

Tests will be written in a follow up change.

Bug: 358229113
Bug: 369361373
Test: manual
Test: atest ActionDisabledByAdminDialogTest
Test: atest ExternalSourcesDetailsTest
Test: atest LocationInjectedServicesPreferenceControllerTest
Flag: android.security.aapm_api
Flag: android.security.aapm_feature_disable_install_unknown_sources
Change-Id: Icedef421d65f7ccde6562734e39a87d4458567ff
2024-11-26 10:20:18 +00:00
Zaiyue Xue
8e6066f5d6 [PixelCare] Catalyst migration for battery header
NO_IFTTT=initialization

Bug: 372774754
Test: manual
Flag: com.android.settings.flags.catalyst_power_usage_summary_screen
Change-Id: Icc1c46069147830b3360a467ffc2e666dadd3ddd
2024-11-26 14:38:16 +08:00
Zaiyue Xue
47d8e1daee Remove BatteryHeaderPreferenceController usage in PowerUsageSummary.
This is a no-op refactor. This change makes the BatteryHeaderPreference Catalyst migration doesn't depend on PowerUsageSummary.

Bug: 372774754
Test: manual
Flag: EXEMPT bug fix
Change-Id: I3d8d2856036f6840a0a163c35668f55baee487ab
2024-11-26 14:36:16 +08:00
Zaiyue Xue
178eb0bd15 Split battery header text to a separated preference
This is a no-op refactor. This change makes the Catalyst migration of battery level bar easy.

Bug: 372774754
Test: manual
Flag: EXEMPT bug fix
Change-Id: I6e64e6d9b34aeca584f4d4e951c58c3e1b361f9d
2024-11-26 13:09:12 +08:00
Riley Jones
3b5b88f650 Merge "Makes all custom caption settings unsearchable when custom captions are not active." into main 2024-11-25 21:40:20 +00:00
Daniel Norman
b4dbc50d6a Merge "Cleanup flag "check_prebundled_is_preinstalled"" into main 2024-11-25 20:45:50 +00:00
Daniel Norman
9808ee15bd Merge "Cleanup flag "audio_balance_state_description"" into main 2024-11-25 20:45:16 +00:00
Riley Jones
6f8e823e0e Makes all custom caption settings unsearchable when custom captions are not active.
Unifies all custom caption controllers under a base controller, whose searchability is directly determined by CaptionHelper#getCustomCaptionAvailability().

Test: atest CaptionHelperTest
Bug: 353757664
Flag: com.android.settings.accessibility.fix_a11y_settings_search
Change-Id: If44e6eca4c72aa4413cd0a6e8735dbb22c7abe62
2024-11-25 18:59:01 +00:00
Shaowei Shen
1085bb4739 Merge "[Physical Keybaord] Add keyboard touchpad/Mouse page - part1" into main 2024-11-25 09:31:58 +00:00
Zaiyue Xue
457029b355 Branch the following two files to make the next cl easy to review.
BatteryHeaderPreferenceController -> BatteryHeaderTextPreferenceController
BatteryHeaderPreferenceControllerTest -> BatteryHeaderTextPreferenceControllerTest

Bug: 372774754
Test: manual
Flag: EXEMPT bug fix
Change-Id: Ifed34f26b8229598050e9ef0da506ec656a78404
2024-11-25 12:44:10 +08:00
shaoweishen
2be5ef9426 [Physical Keybaord] Add keyboard touchpad/Mouse page - part1
1. rename TrackpadSetting to TouchpadAndMouseSetting
to match more about usage.

2. Add separated pages for touchpad and mouse.
Gather options from current page and put it accordingly.
Please note that this change only add isolate files for pages
and didn't reference from anywhere, it will be done in next change.

This is part of feature for keyboard setting update.
document: go/new-a11y-touchpad-mouse-page

Bug: 377602364
Test: atest SettingsRoboTests
Flag: com.android.settings.keyboard.keyboard_and_touchpad_a11y_new_page_enabled
Change-Id: I9e18ce3fbc3617bfb6cef3c272f3cfcfd2ff8a37
2024-11-25 03:04:36 +00:00
Jacky Wang
8e73d0f51e [Catalyst] Update RemoveAnimationsPreference
Bug: 373451690
Flag: com.android.settings.flags.catalyst_accessibility_color_and_motion
Test: atest & devtool
Change-Id: Id648febf32bebb391f1277e28f58ddb0d5130d59
2024-11-23 06:24:13 +08:00
Cam Bickel
330834b819 Cleanup flag "audio_balance_state_description"
Bug: b/319575109
Test: atest BalanceSeekBarTest
Flag: EXEMPT flag cleanup
Change-Id: I5057a7732f5986533ff8a6b0ebf60e8a55a1dc9f
2024-11-22 17:41:25 +00:00
Cam Bickel
de0e5cdff9 Cleanup flag "check_prebundled_is_preinstalled"
Bug: b/353888087
Test: atest AccessibilitySettingsTest
Flag: EXEMPT flag cleanup
Change-Id: Ia16cc83b1d499bac3845c7397ae1ac3e4c97ae91
2024-11-22 17:27:10 +00:00
Camden Bickel
fdd29cdce6 Merge "Cleanup flag "never_restrict_a11y_activity"" into main 2024-11-22 17:03:51 +00:00
Shaowei Shen
038d424c24 Merge "[Keyboard Setting] Rename KeyboardSettingUtils" into main 2024-11-22 06:32:00 +00:00
Cam Bickel
4072d43123 Cleanup flag "never_restrict_a11y_activity"
Full flag name: "never_restrict_accessibility_activity"

Bug: b/331990900
Test: atest RestrictedPreferenceHelperTest
Flag: EXEMPT flag cleanup
Change-Id: I365ed105043cb4835075b8b9016b41862f82021c
2024-11-21 23:22:27 +00:00
Haijie Hong
170667e52a Merge "Add metrics for new bluetooth device details" into main 2024-11-21 11:50:43 +00:00
Jacky Wang
efcb4dfddf [Catalyst] Migrate AmbientDisplayAlwaysOnPreferenceController
As the preference is exported as external settings, for safety, do not
update the preference key with datastore key. As a workaround, manage a
mapping between preference hierarchy key and datastore key.

Bug: 372307567
Flag: com.android.settings.flags.catalyst_lockscreen_from_display_settings
Test: devtool
Change-Id: I56126485061859b41216cd23b8e1caf63823a1ec
2024-11-21 13:37:31 +08:00
Yiyi Shen
c527b40370 [Audiosharing] Update dialog style and wording
Test: manual
Bug: 379612304
Flag: com.android.settingslib.flags.enable_le_audio_sharing

Change-Id: Ibcde412670693b13d995cdd18193cb0b79a9b52d
2024-11-20 08:49:27 +00:00
Pat Manning
9ab4567c71 Merge "Add Settings page for three finger tap customization" into main 2024-11-20 08:21:07 +00:00
Daniel Norman
9ef696d0e8 Migrate Remove Animations preference to Catalyst backend.
This preference (and its test) has no flagging, but its parent
page 'Color and motion' is flagged for Catalyst migration.

This preference looks identical before and after migration.

Fix: 373451690
Flag: com.android.settings.flags.catalyst_accessibility_color_and_motion
Test: atest RemoveAnimationsPreferenceTest
Test: Enable our flag, and top-level Catalyst flag;
      Toggle the setting in Settings > Accessibility;
      Observe expected changes to animation behavior;
Change-Id: I07dbe45a120780439393d7cfd46a749025b7ab0c
2024-11-19 23:10:37 +00:00
Pat Manning
00ec5248cb Add Settings page for three finger tap customization
Test: TouchpadThreeFingerTapFragmentTest
Test: TouchpadThreeFingerTapPreferenceControllerTest
Flag: com.android.hardware.input.touchpad_three_finger_tap_shortcut
Bug: 376249366
Change-Id: I63a9a1cbe5f5ed644c39e1a30aa724ea9e5088cb
2024-11-19 20:29:43 +00:00
Matthew DeVore
46da53099c clampPosition function for dragging display blocks
Uses the algorithm in the prototype and the design doc
(go/extend-cd-settings).

Bug: b/352650922
Test: atest TopologyClampTest.kt
Flag: com.android.settings.flags.display_topology_pane_in_display_list
Change-Id: I8d8d4427f5d5dc069b1529f8ca6ac2cee259ee8e
2024-11-19 15:04:02 +00:00
shaoweishen
fb6f25ff28 [Keyboard Setting] Rename KeyboardSettingUtils
rename KeyboardSettingUtils to match more about usage.

Bug: 379594195
Test: atest SettingsRoboTests
Flag: NONE, rename file.
Change-Id: If978e7b56ecbdb0b571db5ff34553bbb20f976ee
2024-11-19 03:20:51 +00:00
Jaewan Kim
b8b4e47d6b Merge "Hide Linux terminal if device doesn't meet minimum requirement" into main am: 5965a10f60 am: ea27253a31
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3350252

Change-Id: I7ab9bad6a2c396c024e99c4a5cec8db67cdbaa02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-19 01:57:35 +00:00
Jaewan Kim
ea27253a31 Merge "Hide Linux terminal if device doesn't meet minimum requirement" into main am: 5965a10f60
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3350252

Change-Id: I2387ed8be5c63cd75c29a506d170fb916399cff2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-19 01:34:26 +00:00
Matthew DeVore
c4dd7a8288 Add flag for surfacing display topology prototype
This will force the topology pane to show in the displays list UI, and
make the displays list UI accessible from the connected devices
fragment, regardless of the number of actual devices connected.

Once the display topology pane is using real data, this will still be
useful to not skip the display list UI, which currently can only be
shown when there is more than one external display connected.

To turn off, use:
$ adb shell device_config put display_manager com.android.settings.flags.display_topology_pane_in_display_list false

Test: verify "External Display" is always shown in connected devices list
Test: verify displays list is shown when 0 or 1 external display is connected
Bug: b/352648432
Flag: com.android.settings.flags.display_topology_pane_in_display_list
Change-Id: Ic9205c69d9de09e6fb8ae33e17fbf00fe5574447
2024-11-18 12:36:56 -06:00
Xinyi Mao
9a18d2f170 Merge "Remove nested PreferenceCategory in Battery Usage page." into main 2024-11-18 04:56:11 +00:00
mxyyiyi
4c5f8481bd Remove nested PreferenceCategory in Battery Usage page.
https://screenshot.googleplex.com/83LwysPKMCRoRoG

Bug: 349652542
Test: atest BatteryUsageBreakdownControllerTest
Flag: EXEMPT for simple fix
Change-Id: If97b5e3de9757b814ad72aa47f6491d29106b8a3
2024-11-18 11:09:11 +08:00
Dongzhuo Zhang
f7668f4d06 Merge "Add OnAccountsUpdateListener in ContactsStorageSettings to refresh the account when there's account change." into main 2024-11-15 21:37:25 +00:00
Jaewan Kim
a6334bc0a3 Hide Linux terminal if device doesn't meet minimum requirement
Bug: 366374130
Test: Manually, atest
Change-Id: Id0ef47099b3fab41175bfae3d0eaf61037ba82ff
2024-11-15 11:10:25 +09:00
Menghan Li
2dbb5f0c66 Merge "fix(ColorCorrection): Palette preview text contrast Issue" into main 2024-11-15 01:16:35 +00:00
Wes Okuhara
0081fa0d68 Merge "Settings: Fix queryShortcuts_shouldSortBasedOnPriority test" into main 2024-11-14 17:58:37 +00:00
Treehugger Robot
f9ea2a52d3 Merge "Exclude implicit modes from the summary of the Modes entry in Settings" into main 2024-11-14 17:55:43 +00:00
Wes Okuhara
33a7b96f5f Settings: Fix queryShortcuts_shouldSortBasedOnPriority test
Previously this test asserted that the resulting ActivityInfo instances
from the queryShortcuts() method were the same address. While this can
assert general equality, it is more robust to assert the resulting
ResolveInfos- mainly that they are sorted by priority.

Bug: b/314924127
Test: atest SettingsRoboTests:com.android.settings.shortcut.CreateShortcutPreferenceControllerTest
Flag: TEST_ONLY
Change-Id: I00210440c7c1a87a6f8eb7a2866ae8571ec7d053
2024-11-14 16:54:46 +00:00
Matías Hernández
0baf70a4b3 Exclude implicit modes from the summary of the Modes entry in Settings
They are called "Do Not Disturb (App)" which places alphabetically near the top (in English). This can often result in a summary like "DND, Bedtime, DND (App)", which looks silly.

Fixes: 379089451
Test: atest ZenModeSummaryHelperTest
Flag: android.app.modes_ui
Change-Id: Id41caee09cca874297ca12d2ac934aed3f9a43ab
2024-11-14 15:33:54 +00:00
Menghan Li
80f8b87e28 fix(ColorCorrection): Palette preview text contrast Issue
Root Cause: The palette preview's text color inherits dynamic colors from the BC pattern, leading to insufficient contrast against some backgrounds. This wasn't a problem in the original design, as the BC pattern was introduced later.

Solution: Set the palette preview text color to textColorPrimary to ensure the text remains legible against a wider range of background colors.

Bug: 378775277
Flag: EXEMPT bugfix
Test: atest PaletteListPreferenceTest

Change-Id: I8efb9f9d916d618b450df169292202e499d8ac0d
2024-11-14 13:03:17 +00:00
Treehugger Robot
229a1dbca3 Merge "Fix WifiCallingSettingsForSubTest" into main 2024-11-14 12:38:00 +00:00
Fan Wu
40b8917b57 Fix WifiCallingSettingsForSubTest
Bug: 378832412
Test: atest
Flag: EXEMPT fix test
Change-Id: Id45f472e87371eb00ba3412a39ccda5af5723e4b
2024-11-14 08:55:20 +00:00
Haijie Hong
fb9d83ad68 Add metrics for new bluetooth device details
BUG: 343317785
Test: atest DeviceDetailsFragmentFormatterTest
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: Ic74a885627a1426c338b093dcf949688fe9784d1
2024-11-14 15:34:55 +08:00
Treehugger Robot
a869e573a0 Merge "Update resource name and format previously added file" into main 2024-11-14 06:56:14 +00:00
Treehugger Robot
f70d273de6 Merge "Fix NetworkProviderSettingsTest" into main 2024-11-14 05:18:57 +00:00
Jason Chang
97539b3255 Merge "(1/n) Make the GlifHeader scrollable on FingerprintEnrollEnrolling( UDPFS) layout page." into main 2024-11-14 05:13:09 +00:00
Jacky Wang
8f548123f4 Fix NetworkProviderSettingsTest
Bug: 378989988
Flag: TEST_ONLY
Test: atest
Change-Id: Ia3781417210585a77374e5ddedf8ba67278ad397
2024-11-14 12:31:45 +08:00
Fan Wu
b551184b15 Update resource name and format previously added file
Bug: 372774754
Test: atest and device test
Flag: com.android.settings.flags.catalyst_power_usage_summary_screen
Change-Id: Iaa6a07108c4401e844e1a1e19f07fc809e4c43c9
2024-11-14 03:33:57 +00:00
Fan Wu
14ba0b6571 Merge "Revert "Revert "Migrate Battery percentage preference into catal..."" into main 2024-11-14 03:24:54 +00:00
Fan Wu
a794e01d45 Revert "Revert "Migrate Battery percentage preference into catal..."
Revert submission 30375632-revert-30294757-catalyst_battery_percentage-RPJNJOPEZI

Reason for revert: the failures is part of the robolectric issue b/378822459. Tested locally that the change is not breaking ClockworkSetupWizardRoboTests.

Reverted changes: /q/submissionid:30375632-revert-30294757-catalyst_battery_percentage-RPJNJOPEZI

Change-Id: I2210002924650cb54c55a41be25d97a3997c065e
2024-11-14 01:59:16 +00:00