Commit Graph

146748 Commits

Author SHA1 Message Date
Treehugger Robot
8be34b7d4c Merge "aconfig flags for Settings are in the system_ext container" into main 2025-02-18 17:38:09 -08:00
Yongshun Liu
67c5db13ff Merge "a11y: Clean up magnification mode controller and fix lint errors" into main 2025-02-18 17:28:49 -08:00
Treehugger Robot
4e49c7258c Merge "[Catalyst] Rebind restricted preferences for SettingsPreferenceFragment" into main 2025-02-18 16:35:12 -08:00
Nikhil Nayunigari
0afd3f64a5 Merge "Display one row item per Ethernet interface" into main 2025-02-18 15:39:43 -08:00
Yongshun Liu
b8ee801dfd a11y: Clean up magnification mode controller and fix lint errors
This cleans up the magnification mode controller and related code. It
also fixes most of the lint errors in the files.

NO_IFTTT=linter not working

Bug: b/388335935
Flag: EXEMPT refactor
Test: com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragmentTest & com.android.settings.accessibility.MagnificationModePreferenceControllerTest
Change-Id: I368128c3c71285a9511a7831e1d01232e7536d2f
2025-02-18 23:02:08 +00:00
Bill Yi
1a987d259c Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2025-02-18 11:06:56 -08:00
Bill Yi
1a8f4bb4ac Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2025-02-18 11:06:56 -08:00
Bill Yi
91bdb6700e Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2025-02-18 11:06:56 -08:00
Liana Kazanova (xWF)
a17dfe4ecc Merge changes from topic "revert-31790253-UHOKZZQOPA" into main
* changes:
  Revert "Make Satellite UI updatable during receiving callback (P..."
  Revert "Modify the default satellite category title."
2025-02-18 10:46:03 -08:00
Jason Chang
1fc36ccd06 Merge "Fix the Contrast Ratio of the Fingerprint enrollment progress and the "Fingerprint icon" are not high enough in the Fingerprint enrollment flow for light theme." into main 2025-02-18 10:28:33 -08:00
Nikhil Nayunigari
25c5971e89 Display one row item per Ethernet interface
This change adds a preference category to host rows for ethernet
interfaces.

Flag: com.android.settings.connectivity.ethernet_settings

Test: atest
SettingsRoboTests:
com.android.settings.network.NetworkProviderSettingsTest

Bug: 369889610

Change-Id: Idb37cbf17f06db2c9a217659affb35d9dcebadf3
2025-02-18 09:41:49 -08:00
Liana Kazanova (xWF)
790fa6e00e Revert "Make Satellite UI updatable during receiving callback (P..."
Revert submission 31790253

Reason for revert: DroidMonitor: Potential culprit for http://b/397368653 - 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:31790253

Change-Id: I851046019821fff0d132efb0b00cbff1e3ecbe72
2025-02-18 09:35:50 -08:00
Liana Kazanova (xWF)
196a3120c0 Revert "Modify the default satellite category title."
Revert submission 31790253

Reason for revert: DroidMonitor: Potential culprit for http://b/397368653 - 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:31790253

Change-Id: I06797923420570729ef6c4d336637d1c0c59b6b6
2025-02-18 09:35:50 -08:00
Jacky Wang
4ffe4464fc [Catalyst] Rebind restricted preferences for SettingsPreferenceFragment
Bug: 377600992
Fix: 397357248
Flag: com.android.settings.flags.catalyst
Test: manual
Change-Id: I4ce83d8032d9ef8730dec5efd61f9834f2433983
2025-02-18 22:56:09 +08:00
SongFerng Wang
17793e3c26 [automerger skipped] Merge "test: Make mMockitoRule public for AppWithAdminGrantedPermissionsCounterTest" into main am: 4dca839abd am: fcdd8bb6d9 -s ours
am skip reason: Merged-In Id2ecf785655dfcca9f65fc3ee64ffae11fc78e88 with SHA-1 62c2800b3f is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3448908

Change-Id: I80372a4be56b56337b806b96370312c2b33f725d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-18 03:31:57 -08:00
Hakjun Choi
0be57cf311 Merge "Clean up aconfig flag carrier_enabled_satellite_flag" into main 2025-02-18 03:29:48 -08:00
Treehugger Robot
8fda02a7de Merge "Fix crash due to display name is not set to View." into main 2025-02-18 03:11:16 -08:00
SongFerng Wang
fcdd8bb6d9 Merge "test: Make mMockitoRule public for AppWithAdminGrantedPermissionsCounterTest" into main am: 4dca839abd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3448908

Change-Id: I765810619bbf6685ec5f08b0fd4a6d6b14c12e1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-18 03:09:11 -08:00
Chelsea Hao
792389df2d Merge changes from topic "talkback_dialog" into main
* changes:
  Show turn off talkback dialog if needed in find an audio stream page.
  Show turn off talkback dialog if needed in `AudioStreamConfirmDialog`.
2025-02-18 03:01:49 -08:00
SongFerng Wang
4dca839abd Merge "test: Make mMockitoRule public for AppWithAdminGrantedPermissionsCounterTest" into main 2025-02-18 02:37:57 -08:00
tom hsu
04006ccb48 Fix crash due to display name is not set to View.
Flag: EXEMPT bug fix
Fix: b/396700275
Test: manual test
Change-Id: I2a70c4e31c182f99cc4fb3da93ce7911da005429
2025-02-18 10:04:34 +00:00
Chelsea Hao
11dea241fa Merge "Skip "Stream paused" state change after a stream is set to "Wrong password" state." into main 2025-02-18 01:36:33 -08:00
utzcoz
799e0e877a test: Make mMockitoRule public for AppWithAdminGrantedPermissionsCounterTest
Rule should be public for junit.

Test: atest SettingsRoboTests:com.android.settings.applications.AppWithAdminGrantedPermissionsCounterTest

Merged-In: Id2ecf785655dfcca9f65fc3ee64ffae11fc78e88

Change-Id: I2f577f71011e1197703e115b704af0aa1ee1e5dd
Signed-off-by: utzcoz <utzcoz@gmail.com>
2025-02-18 00:51:24 -08:00
Hakjun Choi
1a53ea7a05 Clean up aconfig flag carrier_enabled_satellite_flag
Bug: 393951373
FLAG: EXEMPT flag clean up
Test: atest NetworkSelectSettingsTest WifiCallingSettingsForSubTest SatelliteSettingsPreferenceControllerTest
Test: manual test in live network
Change-Id: I154e9be8a8c771fafb37af078be7b495f18b6100
2025-02-18 08:41:14 +00:00
Aleksander Morgado
c9aaa03d7b Merge changes from topic "settings-visibility-return-fixes" into main
* changes:
  Return DISABLED_FOR_USER in deviceinfo/simstatus availability if not admin user
  Return UNSUPPORTED_ON_DEVICE in deviceinfo/simstatus when no telephony
  Added unit tests for SimStatusPreferenceController visibility
  Return DISABLED_FOR_USER in IMEI availability if not admin user
  Return UNSUPPORTED_ON_DEVICE in network/imei when no telephony
  Added unit test for MobileNetworkImeiPreferenceController visibility
  Added unit tests for ImeiInfoPreferenceController visibility
  Return UNSUPPORTED_ON_DEVICE in network/phonenumber when no telephony
2025-02-18 00:10:26 -08:00
Tom Hsu
faabe07453 Merge changes Ic1e09334,I55423317 into main
* changes:
  Modify the default satellite category title.
  Make Satellite UI updatable during receiving callback (Part II)
2025-02-17 23:49:38 -08:00
Treehugger Robot
caa4fa6715 Merge "Make Satellite UI updatable during receiving callback (part I)" into main 2025-02-17 23:39:07 -08:00
tom hsu
400dc33b13 Modify the default satellite category title.
Flag: EXEMPT resource update
Fix: b/382707562
Test: Manual test
Change-Id: Ic1e093349ff9466e134b74a2af8a051c8c2225d4
2025-02-17 22:34:56 -08:00
tom hsu
9df2e6fdc9 Make Satellite UI updatable during receiving callback (Part II)
- Refactor code
 - Make Satellite category and preference be updatable by callback.

Flag: EXEMPT bug fix
Fix: b/396233604
Fix: b/382664790
Test: atest pass
Change-Id: I55423317d82589312ce4a2f851b32b242529e922
2025-02-18 06:32:33 +00:00
tom hsu
048be18c5e Make Satellite UI updatable during receiving callback (part I)
- Refactor code
 - Make Satellite category and preference be updatable by callback.

Flag: EXEMPT bug fix
Fix: 396233604
Test: atest pass
Change-Id: If2e3d9b82950f05c4911ee7ce3bb41fb26e0d3e4
2025-02-18 06:19:47 +00:00
Shaowei Shen
5703095c5c Merge "[Physical Keyboard] update color of Dialog" into main 2025-02-17 21:27:23 -08:00
shaoweishen
5daef3cfee [Physical Keyboard] update color of Dialog
1. update color of slider in dialog to increase contrast
2. not showing device name in Mouse key page if there's only one device
   connected
Bug: 374030364
Bug: 377464791
Flag: com.android.settings.keyboard.keyboard_and_touchpad_a11y_new_page_enabled
Test: atest
packages/apps/Settings/tests/robotests/src/com/android/settings/inputmethod/

Change-Id: I94d7859ba1dfdad7fdca2ee750a5afeb881756f4
2025-02-18 03:47:41 +00:00
Shaowei Shen
f9cf2b0aa9 Merge "[Physical Keyboard] update mouse key images color" into main 2025-02-17 19:22:27 -08:00
Jacky Wang
ed5b8b3327 [Catalyst] Use deeplink for high sensitivity
Fix: 396461663
Flag: com.android.settingslib.flags.settings_catalyst
Test: atest
Change-Id: I27629b8ac2a3d0b9f2fe834c78c2bcd11a38b4e0
2025-02-17 23:29:38 +08:00
Treehugger Robot
be9c39f0aa Merge "Fix test error of SatelliteSettingsPreferenceControllerTest" into main 2025-02-17 05:51:07 -08:00
SongFerng Wang
6946f8238a Merge "The phone number title color is incorrect" into main 2025-02-17 05:50:30 -08:00
Garvita Jain
ba7233ad09 Merge "[Expressive Design] Migrate Storage settings pages" into main 2025-02-17 03:32:52 -08:00
tom hsu
543e446150 Fix test error of SatelliteSettingsPreferenceControllerTest
- Root cause is wrong Resouce string got.

Flag: EXEMPT bug fix
Fix: b/396571641
Test: atest passed
Change-Id: I25a4c7fff0ea20ab3c6e7fde99e1fba2b0288dfd
2025-02-17 11:28:47 +00:00
Jason Chang
22f7ea95b6 Fix the Contrast Ratio of the Fingerprint enrollment progress
and the "Fingerprint icon" are not high enough in the Fingerprint
enrollment flow for light theme.

Change the Fingerprint enrollment progress color which is based on
GM3 baseline color and ensure the contrast ratio is larger than 3:1

Flag: EXEMPT bugfix

Bug: 378400987

Test: local build and verify the UI color ratio
Change-Id: Ibd8b7c87f31f848f371f922461972756dd0e9090
2025-02-17 10:56:01 +00:00
songferngwang
bc4445ccb6 The phone number title color is incorrect
Remove the selectable = false

Bug: 385993616
Test: verify the UI on device
Flag: EXEMPT bugfix
Change-Id: I3bb456282b1ef065738a0f9c17fff417992eae4a
2025-02-17 09:07:53 +00:00
Aleksander Morgado
22c8840526 Return DISABLED_FOR_USER in deviceinfo/simstatus availability if not admin user
The correct return when checking for the SIM status field availability
for non-admin users is DISABLED_FOR_USER.

UNSUPPORTED_ON_DEVICE should only be used when the setting is
unconditionally hidden as the device does not support the feature.

Bug: 395714454
Flag: EXEMPT bugfix
Test: atest SimStatusPreferenceControllerTest

Change-Id: I9bd290f1bdd73909be383a24f2c762d295089ff6
2025-02-17 00:44:30 -08:00
Aleksander Morgado
d58d0be2e1 Return UNSUPPORTED_ON_DEVICE in deviceinfo/simstatus when no telephony
If the device does not have any telephony support (either via the
build-time config_show_sim_info=false boolean flag, or when not
declaring the PackageManager.FEATURE_TELEPHONY_DATA feature flag),
returning UNSUPPORTED_ON_DEVICE makes more sense than
CONDITIONALLY_UNAVAILABLE, as there is no runtime change that would
make it available.

Bug: 395714454
Flag: EXEMPT bugfix
Test: atest SimStatusPreferenceControllerTest
Change-Id: I0735c949a590190cdc177cbca835444691c50faa
2025-02-17 00:44:30 -08:00
Aleksander Morgado
4cc14d6553 Added unit tests for SimStatusPreferenceController visibility
The new test checks whether the item is available when
config_show_sim_info=false, when telephony is not data capable and
when the user is not admin,

The default visibility status for all tests is defined in the test
setup().

Bug: 395714454
Flag: EXEMPT test only
Test: atest SimStatusPreferenceControllerTest
Change-Id: I8791d9fd4d7ab8648946f044d7aa6a0e77283a00
2025-02-17 00:44:30 -08:00
Aleksander Morgado
64fb695d9b Return DISABLED_FOR_USER in IMEI availability if not admin user
The correct return when checking for the IMEI field availability
for non-admin users is DISABLED_FOR_USER.

UNSUPPORTED_ON_DEVICE should only be used when the setting is
unconditionally hidden as the device does not support the feature.

Bug: 395714454
Flag: EXEMPT bugfix
Test: atest ImeiInfoPreferenceControllerTest
Test: atest MobileNetworkImeiPreferenceControllerTest

Change-Id: I4ee89a84953993daad539d33d3a2e576540c580f
2025-02-17 00:44:30 -08:00
Aleksander Morgado
2a0ad1efdf Return UNSUPPORTED_ON_DEVICE in network/imei when no telephony
If the device does not have any telephony support (either via the
build-time config_show_sim_info=false boolean flag, or when not
declaring the PackageManager.FEATURE_TELEPHONY_DATA feature flag),
returning UNSUPPORTED_ON_DEVICE makes more sense than
CONDITIONALLY_UNAVAILABLE, as there is no runtime change that would
make it available.

This change also aligns the behavior with the deviceinfo/imei
entry.

Bug: 395714454
Flag: EXEMPT bugfix
Test: atest MobileNetworkImeiPreferenceControllerTest
Change-Id: Ia01cf3812f8343eabd8ea6970b691ac71432e8bd
2025-02-17 00:44:30 -08:00
Aleksander Morgado
dc86669298 Added unit test for MobileNetworkImeiPreferenceController visibility
The new test checks whether the item is available when the
SubscriptionUtil.isSimHardwareVisible() method returns true, i.e. if
the config_show_sim_info boolean flag is true on non-test runtime.

The default visibility status for all tests is defined in the test
setup() method.

Bug: 395714454
Flag: EXEMPT test only
Test: atest MobileNetworkImeiPreferenceControllerTest

Change-Id: Iaa8be041f0299ac36d532ed68fdc9c30e5690b11
2025-02-17 00:44:30 -08:00
Aleksander Morgado
4f4580e5f5 Added unit tests for ImeiInfoPreferenceController visibility
The new test checks whether the item is available when
config_show_sim_info=false, when telephony is not data capable and
when the user is not admin,

The default visibility status for all tests is defined in the test
setup().

Bug: 395714454
Flag: EXEMPT test only
Test: atest ImeiInfoPreferenceControllerTest
Change-Id: Ic4df12da216e5c343cf696d931ff02dc942d105f
2025-02-17 00:44:30 -08:00
Aleksander Morgado
a66d27c488 Return UNSUPPORTED_ON_DEVICE in network/phonenumber when no telephony
If the device does not have any telephony support (either via the
build-time config_show_sim_info=false boolean flag, or when not
declaring the PackageManager.FEATURE_TELEPHONY_DATA feature flag),
returning UNSUPPORTED_ON_DEVICE makes more sense than
CONDITIONALLY_UNAVAILABLE, as there is no runtime change that would
make it available.

This change also aligns the behavior with the deviceinfo/phonenumber
entry.

Bug: 395714454
Flag: EXEMPT bugfix
Test: atest MobileNetworkPhoneNumberPreferenceControllerTest

Change-Id: I5f2392969fad1884a89de3870ad37be5601fbe37
2025-02-17 00:44:30 -08:00
Treehugger Robot
90feafb10a [automerger skipped] Merge "Disable Reset app preference during the call." into main am: f7631498f1 am: 962cd2e8d8 -s ours
am skip reason: Merged-In If64b6c878b2f793c6852d000d9d90dda18ef2420 with SHA-1 c6544f991f is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3498088

Change-Id: I5ac4632bfd1cd6debad5beb1be88828ccfc63941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-16 20:39:43 -08:00
Treehugger Robot
962cd2e8d8 Merge "Disable Reset app preference during the call." into main am: f7631498f1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3498088

Change-Id: I26d7efefb17009300631096118978ec872ea8fc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-16 20:15:38 -08:00