Commit Graph

146922 Commits

Author SHA1 Message Date
Adrian Roos
d85d04d98a packages/apps/Settings: remove deprecated Mockito usages
Test: m checkbuild
Flag: TEST_ONLY
Bug: 310268946
Change-Id: Ibfe27bc2399bf1f06d6b790f9fe68d31da60e43a
2025-03-05 06:02:12 -08:00
SongFerng Wang
57da8021d0 Merge "Add null checker for telephonymanager" into main 2025-02-25 02:14:42 -08:00
songferngwang
e4c2cddfae Add null checker for telephonymanager
Bug: 399023211
Test: atest Enable2gPreferenceControllerTest
Flag: EXEMPT bugfix
Change-Id: I3872ecfff2296cbec9f0ef54ee7cee5a554f111f
2025-02-25 08:41:55 +00:00
Zoey Chen
4cbc560d1d Merge "[Settings] Add test case for new LocalePicker page - suggested language" into main 2025-02-25 00:40:30 -08:00
Zoey Chen
c0a09796b8 [Settings] Add test case for new LocalePicker page - suggested language
Bug: 396285228
Test: atest
Test: atest SettingsRoboTests:com.android.settings.localepicker.SystemLocaleSuggestedListPreferenceControllerTest
Test: atest SettingsUnitTests:com.android.settings.localepicker.SystemLocaleSuggestedListPreferenceControllerTest
Flag: EXEMPT refactor
Change-Id: I70d731b50775bf45ae0d73e4da9ea78dfcd3826c
2025-02-24 22:36:29 -08:00
Zoey Chen
528a5e237f Merge "[Settings] Fix test failure" into main 2025-02-24 22:33:45 -08:00
Jacky Wang
4c799cf2eb Merge "[Catalyst] Lock screen summary is not updated" into main 2025-02-24 20:40:25 -08:00
Zoey Chen
6429735cb3 [Settings] Fix test failure
Change-Id: I06b56a378ab37f476801d0da97b68c4e3e07906c
Test: atest SettingsUnitTests:com.android.settings.localepicker.LocaleDialogFragmentTest
Bug: 396802384
Flag: EXEMPT bugfix
2025-02-24 20:09:09 -08:00
Treehugger Robot
69c155e218 Merge "Use SwitchPreferenceCompat for UI consistency" into main am: 77f21a8d0a am: 851c8a5ff6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3502129

Change-Id: I07dede53d57dd72366db3aea23e23f206f7b9a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-24 18:54:32 -08:00
Treehugger Robot
851c8a5ff6 Merge "Use SwitchPreferenceCompat for UI consistency" into main am: 77f21a8d0a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3502129

Change-Id: I932bcbfd0f9b444ec87de09bfbf1eb57ebdfe803
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-24 18:29:19 -08:00
Treehugger Robot
77f21a8d0a Merge "Use SwitchPreferenceCompat for UI consistency" into main 2025-02-24 18:12:06 -08:00
Jack Yu
0b2effb371 Merge "Cleaned up the flag enforce_telephony_feature_mapping_for_public_apis" into main 2025-02-24 17:45:03 -08:00
Jacky Wang
ae280f8721 [Catalyst] Lock screen summary is not updated
In original implementation, DashboardFragment.onResume calls
AbstractPreferenceController.updateState to refresh preference. While
after Catalyst migration, it requires explicit update when external
dependency is changed.

Bug: 397798327
Flag: com.android.settings.flags.catalyst_lockscreen_from_display_settings
Test: adb shell settings put secure lock_screen_show_notifications/lock_screen_allow_private_notifications
Change-Id: I1c16d7df62cdb1cb53d365f2636aa1dc0a424839
2025-02-25 09:01:43 +08:00
Wa Gao
c668a9e5c1 Merge "Disable the ContentProtection setting switch bar when current user is a guest user." into main 2025-02-24 16:02:09 -08:00
Treehugger Robot
b865f8a60d Merge "FactoryResetPreferenceController return null when permission isn't grandted." into main 2025-02-24 14:29:36 -08:00
Omer Ozer
3a8f193bb5 FactoryResetPreferenceController return null when permission isn't
grandted.

Flag: EXEMPT bugfix
Bug: 396580123
Test: manual
Change-Id: Id68dcebc600de21fddf8801757dfb56b92a1a773
2025-02-24 21:17:57 +00:00
Owner Cleanup Bot
e0dc58fc79 Merge "[owners] Remove zhangjerry@google.com from src/com/android/settings/connecteddevice/usb/OWNERS" into main am: b384fe708b am: 59781d008c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3504631

Change-Id: I137cf3c3538b22cfd63ac1b17e4cdaa3ac2b986f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-24 07:58:07 -08:00
Owner Cleanup Bot
59781d008c Merge "[owners] Remove zhangjerry@google.com from src/com/android/settings/connecteddevice/usb/OWNERS" into main am: b384fe708b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3504631

Change-Id: I179e8b48c9fb0943714de02ed4b8ca2e9d1de7bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-24 06:58:52 -08:00
Owner Cleanup Bot
b384fe708b Merge "[owners] Remove zhangjerry@google.com from src/com/android/settings/connecteddevice/usb/OWNERS" into main 2025-02-24 06:26:16 -08:00
Kanyinsola Fapohunda
ca552d4e89 Merge "Change namespace for time_help_and_feedback_feature_supported server flag" into main 2025-02-24 04:48:22 -08:00
Haijie Hong
5e79d18636 Merge "Add Nearby share entrypoint in DevicePicker" into main 2025-02-23 23:30:32 -08:00
Garvita Jain
5b5bef71f1 Merge "[Expressive Design] Migrate Storage settings dashboard for Work profile" into main 2025-02-23 23:18:37 -08:00
Chaohui Wang
ceea22c012 Merge "Override isSpaExpressiveEnabled in Settings" into main 2025-02-23 22:17:05 -08:00
Chaohui Wang
04c7e27a73 Override isSpaExpressiveEnabled in Settings
Into SettingsSpaEnvironment.

Bug: 386013400
Flag: com.android.settingslib.widget.theme.flags.is_expressive_design_enabled
Test: visual - expressive can enabled for spa in Settings
Change-Id: I5225948c733a57855168a3e633fc4fbd4dd6f89a
2025-02-24 12:08:27 +08:00
Treehugger Robot
93ff3c4f7a Merge "Do not set title description for Confirm Activity" into main 2025-02-23 20:04:58 -08:00
Owner Cleanup Bot
125a6223af [owners] Remove zhangjerry@google.com from src/com/android/settings/connecteddevice/usb/OWNERS
This suggested change is automatically generated based on group
memberships and affiliations.

Please approve this change and vote the highest CR. This will keep the OWNERs
file tidy.  We ask that you do not ignore this change and approve it
unless you know a reason the OWNER should remain.  It can always be
reverted if needed.

If this change is in error, vote the lowest CR value (i.e. reject the CL)
and the bot will abandon it.

See the owner's recent review activity for context:
https://android-review.googlesource.com/q/zhangjerry@google.com

To report an issue, file a bug in the Infra>Codereview component.

Change-Id: Icfd162bf283cf74e3270d97a8ac15dcb2dfb34d3
2025-02-22 09:05:23 -08:00
Shaowei Shen
49859abb4b Merge "[Physical Keyboard] Update Input Setting Dialog" into main 2025-02-22 02:36:32 -08:00
Yuhan Yang
664df0f4cc Update autoclick shortcut searchable
Add autoclick shortcut to search index when
enable_autoclick_indicator flag is enabled.
Hide it when the flag is off.

Bug: 397719419
Test: atest ToggleAutoclickPreferenceFragmentTest
Flag: com.android.server.accessibility.enable_autoclick_indicator
Change-Id: Ib6d25067d024ff0dbea64d17d38fc544c615db97
2025-02-21 22:36:53 +00:00
Yuhan Yang
4d52d72337 Only create shortcut preference when no existing shortcut found
Update onCreateView in AccessibilityShortcutPreferenceFragmen
so it only create a new shortcutPreference when no existing
shortcut preference is found.

Bug: 397719419
Test: Manually verified on test devices
Flag: com.android.server.accessibility.enable_autoclick_indicator
Change-Id: Ic4747240cfd3d48fd97c61fd0b15d44f6ba5cf0a
2025-02-21 22:36:53 +00:00
Treehugger Robot
29b9665128 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2025-02-21 13:47:42 -08:00
Treehugger Robot
6397625c92 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2025-02-21 13:47:42 -08:00
Treehugger Robot
a5f7b21855 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2025-02-21 13:47:42 -08:00
Yuhan Yang
ea90ad7194 Merge "Finalize mouse Scrolling settings strings" into main 2025-02-21 12:37:04 -08:00
Owner Cleanup Bot
b22cebe941 Merge "[owners] Remove bonianchen@google.com from src/com/android/settings/sim/OWNERS" into main am: f16b9f85a1 am: 1a2021fe66
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3499870

Change-Id: I56dd62f3b24da922af1292bfdf47868c111bda8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-21 12:10:18 -08:00
Owner Cleanup Bot
73df0ba4a4 Merge "[owners] Remove bonianchen@google.com from src/com/android/settings/deviceinfo/OWNERS" into main am: 0d7517c021 am: 62651fd633
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3497484

Change-Id: I66b2f7fba0b38d099f2ea86ea64da2358d7e1439
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-21 12:09:31 -08:00
Owner Cleanup Bot
840197127e Merge "[owners] Remove bonianchen@google.com from src/com/android/settings/datausage/OWNERS" into main am: f7457e99a2 am: 01d42a8f16
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3497483

Change-Id: Ic41a7de069977b7c8109438c9f9a081769133a44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-21 12:08:09 -08:00
Owner Cleanup Bot
1a2021fe66 Merge "[owners] Remove bonianchen@google.com from src/com/android/settings/sim/OWNERS" into main am: f16b9f85a1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3499870

Change-Id: If51ca705603b0f00e776f7c2b98ee12c0dccaaef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-21 11:45:37 -08:00
Owner Cleanup Bot
62651fd633 Merge "[owners] Remove bonianchen@google.com from src/com/android/settings/deviceinfo/OWNERS" into main am: 0d7517c021
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3497484

Change-Id: I3d477b780ba85e4c214de837b6bbab425b13aff1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-21 11:45:24 -08:00
Owner Cleanup Bot
01d42a8f16 Merge "[owners] Remove bonianchen@google.com from src/com/android/settings/datausage/OWNERS" into main am: f7457e99a2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3497483

Change-Id: Ibab36faa75e1d4c187af9d674ccecfe1575413b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-21 11:44:00 -08:00
Yuhan Yang
20ad24a911 Finalize mouse Scrolling settings strings
Screenshot: go/screenshot-7NVc6dShvsUzgMx
Mock: go/al-peripherals-ux page 3

Bug: 384795606
Test: Verified UI on test devices
Flag: com.android.hardware.input.mouse_scrolling_acceleration
Change-Id: If145ab7a0955a288582af9a9cb437538cf7abd09
2025-02-21 11:32:11 -08:00
Owner Cleanup Bot
f16b9f85a1 Merge "[owners] Remove bonianchen@google.com from src/com/android/settings/sim/OWNERS" into main 2025-02-21 11:15:59 -08:00
Yuhan Yang
7c467be118 Merge "Add autoclick shortcut to a11y autoclick settings" into main 2025-02-21 11:15:54 -08:00
Owner Cleanup Bot
0d7517c021 Merge "[owners] Remove bonianchen@google.com from src/com/android/settings/deviceinfo/OWNERS" into main 2025-02-21 11:13:55 -08:00
Owner Cleanup Bot
f7457e99a2 Merge "[owners] Remove bonianchen@google.com from src/com/android/settings/datausage/OWNERS" into main 2025-02-21 11:13:51 -08:00
Matthew DeVore
bdd9cca602 Merge changes I550fc918,I16b3ae92 into main
* changes:
  Disable mirror toggle if feature turned off
  Use PrefRefresh for Preference caching
2025-02-21 08:59:44 -08:00
Jason Hsu
d879711020 Merge "Fix default microphone for calls sometimes not work and not show UI" into main 2025-02-21 08:44:13 -08:00
Matthew DeVore
6edab7d35f Disable mirror toggle if feature turned off
If the content mode management feature is disabled, the mirror display
toggle should be disabled, and instead reflect the inverse of the
"force desktop on external displays" system property.

Flag: com.android.settings.flags.display_topology_pane_in_display_list
Test: manual with and without toggle user-changeable
Bug: b/396116157
Change-Id: I550fc918aaebab7129a559c0e49b88c8da7bc00d
2025-02-21 09:43:11 -06:00
Matthew DeVore
c37fc8b827 Use PrefRefresh for Preference caching
Refactor a couple of fields to use PrefRefresh for caching instead
instead of fields. This makes us construct PrefRefresh for display
categories, which we hadn't been doing before, and was causing
b/397466966. This also limits the tests' dependency on implementation.

We had been using fields for caching Preference objects, which doesn't
account for the same preference being needed for each display.
PrefRefresh is a more flexible mechanism for recycling View objects and
it largely makes the fields obsolete.

The reuse* methods (previously get*Preference) can actually be inlined
now that tests aren't calling into them, but to keep the diff easy to
review I left them as separate methods.

Because @NonNull doesn't actually do anything, and is considered the
default, I neglected to add them to new arguments, and deleted them from
lines I modified.

Flag: com.android.settings.flags.display_topology_pane_in_display_list
Test: ExternalDisplayPreferenceFragmentTest.java
Test: with fragment visible, plug-in and activate a new physical display with the Mirror prompt
Test: with topology disabled, verify footer is shown with and without a display attached
Bug: b/397466966
Bug: b/397591022
Change-Id: I16b3ae925ca3d9d79471fd5df00b571ae3fc696f
2025-02-21 09:43:10 -06:00
Owner Cleanup Bot
71eb73374c Merge "[owners] Remove arcwang@google.com from src/com/android/settings/wifi/OWNERS" into main am: 0997a62f67 am: 1ea637ca4b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3503652

Change-Id: I76b8d66fbadbfea1eea66239af526feafb7ddaa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-21 07:09:39 -08:00
Owner Cleanup Bot
1ea637ca4b Merge "[owners] Remove arcwang@google.com from src/com/android/settings/wifi/OWNERS" into main am: 0997a62f67
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3503652

Change-Id: I7e14c37e2529e6ae8a9497eb7dd58155dd84a1bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-21 06:44:48 -08:00