Bill Yi
4e4d0062e1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibcb5258754809359206afd10309f0059498e4557
2025-03-14 01:15:19 -07:00
Adrian Roos
3ab16de602
Merge "packages/apps/Settings: remove usages of deprecated Mockito matchers" into main
2025-03-13 13:31:54 -07:00
Yongshun Liu
19ad5b3eaf
Merge "a11y: Only show the cursor following mode setting with detected mouse" into main
2025-03-13 13:16:39 -07:00
Angela Wang
faebda0cda
Merge "Add background to ambient volume control icons" into main
2025-03-13 12:49:10 -07:00
Amit Talreja (xWF)
bfab8a80d9
Merge "Updated the 2G enable setting title. Bug:391709444 Test: atest Enable2gPreferenceControllerTest Flag: EXEMPT bugfix" into main
2025-03-13 10:47:52 -07:00
Yiyi Shen
5d09af06de
Merge "Avoid unintended pref removal after CSIP main/member switch" into main
2025-03-13 07:07:52 -07:00
Treehugger Robot
91056fc841
Merge "Fixed accessibility issues in Wi-Fi password view for SUW" into main
2025-03-13 06:40:20 -07:00
Shawn Lin
2ed16df7ca
Merge "Update biometrics metrics enums" into main
2025-03-13 03:29:22 -07:00
Angela Wang
c47713d66f
Add background to ambient volume control icons
...
Enhance the visibility and discoverability of ambient volume control
icons by adding backgrounds.
Flag: EXEMPT bugfix
Bug: 398962101
Test: manual check the result and screenshots attached on bug
Change-Id: Ice467191235df63f258bbca4e085fbf8a7f3c555
2025-03-13 10:01:02 +00:00
Yiyi Shen
efe2738735
Avoid unintended pref removal after CSIP main/member switch
...
Test: atest
Bug: 394765052
Flag: EXEMPT small fix
Change-Id: I5b4646ff9ee092b851d3f8d5cc3ac2030f189430
2025-03-13 17:32:38 +08:00
Adrian Roos
693035ab86
packages/apps/Settings: remove usages of deprecated Mockito matchers
...
Upstream Mockito has deleted the deprecated matchers
in the latest version. Migrate usage to replacements
to unblock upgrade.
Test: m checkbuild
Flag: TEST_ONLY
Bug: 310268946
Change-Id: I18160e93912d136f3962e3379a68ba2be82c1c78
2025-03-13 09:54:49 +01:00
Weng Su
351e6a94e0
Fixed accessibility issues in Wi-Fi password view for SUW
...
- Keep the Save button enabled at all times
- Show "*required" or "The password is invalid" to remind the user
Bug: 386897596
Flag: EXEMPT bugfix
Test: Manual testing
atest WifiConfigControllerTest
Change-Id: I442d2f958efd85f3c92309d0bed7cd3aa9ec9876
2025-03-13 15:40:12 +08:00
Shawn Lin
9dfc6173c4
Update biometrics metrics enums
...
Bug: 370940762
Test: atest FaceSettingsAppsPreferenceControllerTest
FaceSettingsKeyguardUnlockPreferenceControllerTest
FingerprintSettingsAppsPreferenceControllerTest
FingerprintSettingsKeyguardUnlockPreferenceControllerTest
Flag: com.android.settings.flags.biometrics_onboarding_education
Change-Id: Iabd5d27358a3cec966210af2fe54079c0d535808
2025-03-13 07:26:24 +00:00
Treehugger Robot
d889fa6277
Merge "[Catalyst] Add flag for Screen Timeout settings in 25Q3" into main
2025-03-12 20:47:38 -07:00
talreja
868299303e
Updated the 2G enable setting title.
...
Bug:391709444
Test: atest Enable2gPreferenceControllerTest
Flag: EXEMPT bugfix
Change-Id: I66bd05441e29b4976343d145ebecaf11fa924b0c
2025-03-12 19:12:48 -07:00
Shawn Lin
a0e0065766
Merge "Launch multiple biometric enrollment when no biometric is enrolled" into main
2025-03-12 19:01:45 -07:00
Chelsea Hao
5c203edc6f
Merge changes from topic "audio_stream_broadcast" into main
...
* changes:
A broadcast receiver to handle `ACTION_LE_AUDIO_PRIVATE_BROADCAST_RECEIVED`.
Add a broadcast receiver for private broadcast receive data.
2025-03-12 18:25:39 -07:00
Sunny Shao
9efc29871f
[Catalyst] Add flag for Screen Timeout settings in 25Q3
...
Test: compile
Bug: 352179685
Bug: 389135914
Flag: com.android.settings.flags.catalyst_screen_timeout_25q3
Change-Id: Ic969c5732357e613df17f36e161fb0bdb702f2cf
2025-03-13 01:19:29 +00:00
Yuhan Yang
92b2b56174
Merge "Add observer to autoclick main switch controller" into main
2025-03-12 14:41:46 -07:00
Bill Yi
3c3086a573
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2025-03-12 14:17:32 -07:00
Bill Yi
0404b91009
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2025-03-12 14:17:32 -07:00
Guojing Yuan
e5087ac36f
[automerger skipped] Merge "[CDM] Checks NLS component name instead of package name" into tm-dev am: 14629c9d47
am: 219079c50b
am: ccce5d5dd5
-s ours am: 9e7a97cf70
-s ours am: bde1a78038
-s ours am: 2c772d1270
-s ours
...
am skip reason: Merged-In I1be52fcb3d52b8b84353ea00fd57d8360ddd966c with SHA-1 b0fce927bf
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31744520
Change-Id: I6dfe7210db6bc6225b0bd48788470f77444d4890
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-03-12 14:06:50 -07:00
Guojing Yuan
a567a7fcc8
[automerger skipped] Merge "[CDM] Checks NLS component name instead of package name" into tm-dev am: 14629c9d47
am: 7d438b77b4
am: 900dbd8df9
am: 31e737038e
am: 0be2e7fe2f
-s ours
...
am skip reason: Merged-In I1be52fcb3d52b8b84353ea00fd57d8360ddd966c with SHA-1 b0fce927bf
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31744520
Change-Id: I8796f3d2352f10ec6fbfe512558581fda88fd900
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-03-12 14:06:36 -07:00
Guojing Yuan
2c772d1270
[automerger skipped] Merge "[CDM] Checks NLS component name instead of package name" into tm-dev am: 14629c9d47
am: 219079c50b
am: ccce5d5dd5
-s ours am: 9e7a97cf70
-s ours am: bde1a78038
-s ours
...
am skip reason: Merged-In I1be52fcb3d52b8b84353ea00fd57d8360ddd966c with SHA-1 b0fce927bf
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31744520
Change-Id: Iadc56ccf4464fdb63c2ef567bbf74c0c45e6a6b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-03-12 13:42:14 -07:00
Guojing Yuan
0be2e7fe2f
Merge "[CDM] Checks NLS component name instead of package name" into tm-dev am: 14629c9d47
am: 7d438b77b4
am: 900dbd8df9
am: 31e737038e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31744520
Change-Id: Ie3e2d20adf07f30e685065a70b1f8e6dece7cf5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-03-12 13:42:00 -07:00
Guojing Yuan
4060b510be
[automerger skipped] Merge "[CDM] Checks NLS component name instead of package name" into tm-dev am: 14629c9d47
am: 219079c50b
am: ccce5d5dd5
-s ours am: 9e7a97cf70
-s ours am: 01693a9988
-s ours
...
am skip reason: Merged-In I1be52fcb3d52b8b84353ea00fd57d8360ddd966c with SHA-1 b0fce927bf
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31744520
Change-Id: I8816b4c71d27c717c99f1d567689fd06318acce0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-03-12 13:41:56 -07:00
Guojing Yuan
7c6c655bd5
[automerger skipped] Merge "[CDM] Checks NLS component name instead of package name" into tm-dev am: 14629c9d47
am: 7d438b77b4
am: 900dbd8df9
am: d46a401c18
-s ours
...
am skip reason: Merged-In I1be52fcb3d52b8b84353ea00fd57d8360ddd966c with SHA-1 f5ed187ffb
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31744520
Change-Id: Ie60c4dcb48dfd770672382103b93ea79d3f3cc18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-03-12 13:41:37 -07:00
Guojing Yuan
01693a9988
[automerger skipped] Merge "[CDM] Checks NLS component name instead of package name" into tm-dev am: 14629c9d47
am: 219079c50b
am: ccce5d5dd5
-s ours am: 9e7a97cf70
-s ours
...
am skip reason: Merged-In I1be52fcb3d52b8b84353ea00fd57d8360ddd966c with SHA-1 b0fce927bf
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31744520
Change-Id: If8032d2cdc61d656a86109e480e225cbbc0fd250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-03-12 13:06:34 -07:00
Guojing Yuan
d46a401c18
Merge "[CDM] Checks NLS component name instead of package name" into tm-dev am: 14629c9d47
am: 7d438b77b4
am: 900dbd8df9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31744520
Change-Id: Ie16c398ccdb50d4aadb345de6d02a86dcd2b3055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-03-12 13:06:18 -07:00
Guojing Yuan
bde1a78038
[automerger skipped] Merge "[CDM] Checks NLS component name instead of package name" into tm-dev am: 14629c9d47
am: 219079c50b
am: ccce5d5dd5
-s ours am: 9e7a97cf70
-s ours
...
am skip reason: Merged-In I1be52fcb3d52b8b84353ea00fd57d8360ddd966c with SHA-1 b0fce927bf
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31744520
Change-Id: Icbc92e1f3ef7b596ace9e9afb038e9fdd0ff2296
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-03-12 13:01:47 -07:00
Guojing Yuan
31e737038e
Merge "[CDM] Checks NLS component name instead of package name" into tm-dev am: 14629c9d47
am: 7d438b77b4
am: 900dbd8df9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31744520
Change-Id: Ibfcbd49f450786c87ee3c3da86dd6e19172a36e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-03-12 13:01:30 -07:00
Guojing Yuan
9e7a97cf70
[automerger skipped] Merge "[CDM] Checks NLS component name instead of package name" into tm-dev am: 14629c9d47
am: 219079c50b
am: ccce5d5dd5
-s ours
...
am skip reason: Merged-In I1be52fcb3d52b8b84353ea00fd57d8360ddd966c with SHA-1 b0fce927bf
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31744520
Change-Id: I6601c8fecf33dcd903d5533872181edb4c1fff6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-03-12 12:53:17 -07:00
Guojing Yuan
900dbd8df9
Merge "[CDM] Checks NLS component name instead of package name" into tm-dev am: 14629c9d47
am: 7d438b77b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31744520
Change-Id: I0c27308d3f8b3532e21fddfdfb48abe03d6a456b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-03-12 12:30:19 -07:00
Guojing Yuan
ccce5d5dd5
Merge "[CDM] Checks NLS component name instead of package name" into tm-dev am: 14629c9d47
am: 219079c50b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31744520
Change-Id: I1cbe0436ee22c9793566f862c1b5d2b58f03c8d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-03-12 12:28:47 -07:00
Yuhan Yang
a8eecd48d9
Add observer to autoclick main switch controller
...
Add an observer in ToggleAutoclickMainSwitchPreferenceController
so when the autoclick is toggled on/off at somewhere else such as
autoclick shortcut, the main switch will change accordingly.
screen cast:
go/screencast-njawnjqynzi2ode1mzm0nhxmztqwmddjzc03oa
Bug: 391416057
Test: verified manually
Flag: com.android.server.accessibility.enable_autoclick_indicator
Change-Id: I6e2a3af55cbd3f03b4feeb268b84510fc55518bf
2025-03-12 19:13:05 +00:00
Vitor Carvalho
67b21fb238
Merge "Update ParentalControlsUtils to use a new utility that is able to retrieve the component for the EnforcedAdmin." into main
2025-03-12 12:00:30 -07:00
Guojing Yuan
219079c50b
Merge "[CDM] Checks NLS component name instead of package name" into tm-dev am: 14629c9d47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31744520
Change-Id: I15292b0ac9a408454e079642ce652737bd490ad9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-03-12 11:56:32 -07:00
Guojing Yuan
7d438b77b4
Merge "[CDM] Checks NLS component name instead of package name" into tm-dev am: 14629c9d47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31744520
Change-Id: Ifd237482647e4893c2e4dddcb87340de5a5fe610
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-03-12 11:55:45 -07:00
Ebru Kurnaz
f9855a3bc1
Merge "Fix density slider not updating density when dragged." into main
2025-03-12 11:52:16 -07:00
Guojing Yuan
14629c9d47
Merge "[CDM] Checks NLS component name instead of package name" into tm-dev
2025-03-12 11:22:03 -07:00
Jan Tomljanovic
17f51b712a
Merge "Add owners files for safetycenter in settings." into main
2025-03-12 10:47:00 -07:00
Junchen Quan
9b0ece9799
Merge "[Device Supervision] Implement createConfirmSupervisionCredentialsIntent API" into main
2025-03-12 10:34:49 -07:00
juquan
160b8bc1bb
[Device Supervision] Implement createConfirmSupervisionCredentialsIntent API
...
The `ConfirmSupervisionCredentialsActivity` has been added and it's intended to be launched via the intent.
Bug: 392961554
Flag: android.app.supervision.flags.enable_supervision_settings_screen
Test: atest SupervisionMainSwitchPreferenceTest
Change-Id: I2322256a5711d5b90f826f467110c6861a7734ad
2025-03-12 10:34:06 -07:00
Graciela Putri
2952619104
Merge "Add LSE App Compat OWNERS for Settings" into main
2025-03-12 09:39:40 -07:00
Shaowei Shen
d688e69c2e
Merge "[Physical Keyboard] Update seekbars" into main
2025-03-12 08:46:59 -07:00
Treehugger Robot
6bdefff962
Merge "[Dialog] Remove the space." into main
2025-03-12 07:58:46 -07:00
Graciela Putri
90cd7eb98c
Add LSE App Compat OWNERS for Settings
...
Flag: EXEMPT adding OWNERS
Fix: 402735141
Test: m
Change-Id: I459bf13bf9ccd067c0ddf067b56ce0e6ecaf4d7d
2025-03-12 07:54:16 -07:00
Hani Kazmi
08fb4d950a
Merge "[AAPM] Add framework stats atoms for Advanced Protection" into main
2025-03-12 06:46:25 -07:00
Vitor Carvalho
89287233f1
Update ParentalControlsUtils to use a new utility that is able to retrieve the component for the EnforcedAdmin.
...
Bug: 382038943
Flag: android.app.supervision.flags.deprecate_dpm_supervision_apis
Test: atest ParentalControlsUtilsTest
Change-Id: Ic2ecf644f2966bbe2e29c4a691db9e004f0d6a0e
2025-03-12 13:41:21 +00:00
Treehugger Robot
5bf1ec1a38
Merge "[Catalyst] Implement metrics/tags for Media page" into main
2025-03-12 05:58:28 -07:00