Matías Hernández
76c89f32f7
Merge "Fix OWNERS for Settings > Notification Special Access" into main am: 9598b65442
am: 228322df95
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3489232
Change-Id: I65182c80aa7509968714fc7cc648c33277e73fea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-11 11:28:08 -08:00
Matías Hernández
0e5619882e
Merge "Fix OWNERS for Settings > Modes/DND Special Access" into main am: 27f58a9de4
am: 17ed485adf
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3489233
Change-Id: Ie8c6a78dc3f645bae6b4dedc4aa508a82a8a089b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-11 11:26:47 -08:00
Matías Hernández
228322df95
Merge "Fix OWNERS for Settings > Notification Special Access" into main am: 9598b65442
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3489232
Change-Id: I38eed43b6fe5db2296a0f63a9c03bb3ce748619b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-11 10:53:45 -08:00
Matías Hernández
17ed485adf
Merge "Fix OWNERS for Settings > Modes/DND Special Access" into main am: 27f58a9de4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3489233
Change-Id: Ia8695faf3777e167ef33f6feaec6abf80a9c0b2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-11 10:52:31 -08:00
Treehugger Robot
dbaa26f9bb
Merge "Apply Expressive style "More” page-down button for Settings Face Enroll Introduction page" into main
2025-02-11 10:45:24 -08:00
Treehugger Robot
e303458082
Merge changes from topic "catalyst" into main
...
* changes:
[Catalyst] Move PreferenceRestrictionMixin
[Catalyst] Move metrics class
2025-02-11 10:11:44 -08:00
Matías Hernández
9598b65442
Merge "Fix OWNERS for Settings > Notification Special Access" into main
2025-02-11 10:03:39 -08:00
Matías Hernández
27f58a9de4
Merge "Fix OWNERS for Settings > Modes/DND Special Access" into main
2025-02-11 10:03:34 -08:00
Jason Chang
8889927181
Apply Expressive style "More” page-down button for Settings
...
Face Enroll Introduction page
Flag: EXEMPT use SUW/Settings Expressive style API to check
Bug: 394223273
Test: build and manually check the UI and its behaviors
Change-Id: Iad9d6a53363fabad05b45a822f8ba6f1b83b9d7b
2025-02-11 17:41:04 +00:00
Matías Hernández
4d53572381
Fix OWNERS for Settings > Modes/DND Special Access
...
Change-Id: I89ff7a3d59b31a19818c0892f025a14f68e7dda9
2025-02-11 09:20:38 -08:00
Matías Hernández
3c01a5cf05
Fix OWNERS for Settings > Notification Special Access
...
Change-Id: I2b2009f418810039874b33c32ebe4f5218fb78a1
2025-02-11 09:20:09 -08:00
Jacky Wang
a2e663dadd
[Catalyst] Move PreferenceRestrictionMixin
...
NO_IFTTT=Catalyst only
Bug: 377600992
Flag: EXEMPT refactor
Test: atest
Change-Id: I3c26a5a56d8fd6e887e4ff4d38d8e8eb97844672
2025-02-11 20:18:43 +08:00
Jacky Wang
afbcf06654
[Catalyst] Move metrics class
...
NO_IFTTT=Catalyst only
Bug: 389886085
Flag: EXEMPT refactor
Test: atest
Change-Id: I8c24a4edf768aa2286adf66f16077e962080bb48
2025-02-11 20:18:30 +08:00
Vaibhav Devmurari
9dc7367909
Merge "Flag cleanup: keyboard_a11y_(bounce/slow/sticky)_keys_flag" into main
2025-02-11 04:03:17 -08:00
Andreea Costinas
2c916f11e2
Merge "Ensure certificate alias is always visible" into main
2025-02-10 23:43:16 -08:00
Yiyi Shen
970eb2075a
Merge "[Audiosharing] Set fallback group to -1 when routing to classic buds" into main
2025-02-10 22:23:32 -08:00
Treehugger Robot
63c0fd61c3
Merge "[Catalyst] Fix restriction issue on sound settings" into main
2025-02-10 21:29:48 -08:00
Yiyi Shen
009747cef9
Merge "[Audiosharing] Block pairing during audio sharing" into main
2025-02-10 21:10:43 -08:00
Jacky Wang
e9afa7c7c6
[Catalyst] Fix restriction issue on sound settings
...
After ag/31443354, sliders on sound settings are not disabled when
"no_adjust_volume" restriction is set. The root cause is that
`SeekBarVolumizer.setSeekBar` updates the SeekBar enabled state.
Bug: 386162594
Flag: EXEMPT bugfix
Test: atest&manual
Change-Id: I5d37c9958a693a26717a8e2d9a62ec5ef225e28f
2025-02-11 12:26:23 +08:00
SongFerng Wang
30af231cc4
Merge "Handle the sim switch for restricted ss mode case" into main
2025-02-10 20:25:41 -08:00
Treehugger Robot
1b1fa4810f
Merge "[Satellite] Add satellite string for KDDI if no entitlement" into main
2025-02-10 19:30:27 -08:00
songferngwang
2d5a231a46
Handle the sim switch for restricted ss mode case
...
The restricted ss mode case is the device lock the sim switch function
in the single sim mode. For this case, UI did not use sim onboarding
flow, and use the sim switch dialog.
Bug: 393151990
Test: verify the sim switch function in the restricted ss mode.
Flag: EXEMPT bugfix
Change-Id: I04439f254010052c78a702618d972a9cf54cece0
2025-02-11 02:26:46 +00:00
tom hsu
292f1bdd01
[Satellite] Add satellite string for KDDI if no entitlement
...
- Currently Android only handles Satellite w/ entitlement for any notifications. Some carriers such as KDDI have no entitlement for satellite service, so this change is to add some strings to avoid any confuse to Android user on satellite service.
Flag: EXEMPT resource update
Fix: b/382387532
Test: Manual test
Test: atest pass
Change-Id: I835787c9e0fe29eeecec0470e9bd6b38939abd8c
2025-02-10 18:26:35 -08:00
Matthew DeVore
a7caa23deb
Merge "Show topology pane in per-display fragment" into main
2025-02-10 09:47:44 -08:00
Tomasz Wasilczyk
f38579f786
Merge "Fix settings crashes on missing Telephony features" into main
2025-02-10 09:20:25 -08:00
Yiyi Shen
2ac50a14c1
[Audiosharing] Set fallback group to -1 when routing to classic buds
...
Bug: 385835055
Bug: 381946931
Test: manual
Flag: com.android.settingslib.flags.adopt_primary_group_management_api
Change-Id: I3f184c9af750221187917751e2cfdf50df112496
2025-02-10 19:08:21 +08:00
Yiyi Shen
93f9061794
[Audiosharing] Block pairing during audio sharing
...
When a) there are two sinks in sharing b) there is at least one temp
bond device connected
Test: atest
Flag: com.android.settingslib.flags.enable_temporary_bond_devices_ui
Bug: 392004799
Change-Id: Id093b4c0b67bdc1db621e0241e79900abbd26c0f
2025-02-10 18:38:53 +08:00
Yiyi Shen
ef77d14185
Merge "[Audiosharing] Set temp bond metadata for just bonded lea buds in sharing" into main
2025-02-10 01:52:41 -08:00
Jack Yu
94ecf1f216
Merge "Removed the flag enable_modem_cipher_transparency_unsol_events" into main
2025-02-10 00:47:42 -08:00
YK Hung
3d6a321aac
Merge "[A11y] Update symbol from '>' to '->' to improve talkback announcement." into main
2025-02-09 23:53:43 -08:00
Shraddha Basantwani
6dfa9e206d
[automerger skipped] Merge "Add biometric authentication for package modification" into tm-qpr-dev am: f459d4073b
-s ours am: 1182123e70
-s ours am: 31ec831661
-s ours am: f62bf8007c
-s ours
...
am skip reason: Merged-In I0c494e307b02229d751de118abcc89e4e61a6861 with SHA-1 27315b3b92
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30686224
Change-Id: I99cb4422d64fe54de0fafd8bab0c733c4c203d38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-09 23:21:46 -08:00
Shraddha Basantwani
ce0a83862f
[automerger skipped] Add biometric authentication for package modification am: 0634208161
-s ours am: fb65cbfd6e
-s ours am: 9a444e43f7
-s ours am: 14efecb346
-s ours
...
am skip reason: Merged-In I0c494e307b02229d751de118abcc89e4e61a6861 with SHA-1 27315b3b92
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30686224
Change-Id: I7bbaa65f7b1d0dc9963b6846512980e75201b48f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-09 23:21:36 -08:00
Shraddha Basantwani
f62bf8007c
[automerger skipped] Merge "Add biometric authentication for package modification" into tm-qpr-dev am: f459d4073b
-s ours am: 1182123e70
-s ours am: 31ec831661
-s ours
...
am skip reason: Merged-In I0c494e307b02229d751de118abcc89e4e61a6861 with SHA-1 27315b3b92
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30686224
Change-Id: I7e65c0d37e59318e7b0f4ecb7ecd024afcc86e92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-09 22:57:06 -08:00
Shraddha Basantwani
14efecb346
[automerger skipped] Add biometric authentication for package modification am: 0634208161
-s ours am: fb65cbfd6e
-s ours am: 9a444e43f7
-s ours
...
am skip reason: Merged-In I0c494e307b02229d751de118abcc89e4e61a6861 with SHA-1 27315b3b92
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30686224
Change-Id: I38d5c28472362c35768e2b62eff8f0a20a3fe07a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-09 22:57:01 -08:00
Shraddha Basantwani
f27c0f9e6c
[automerger skipped] Merge "Add biometric authentication for package modification" into tm-qpr-dev am: f459d4073b
-s ours am: 1182123e70
-s ours am: 37ea2bcd57
-s ours
...
am skip reason: Merged-In I0c494e307b02229d751de118abcc89e4e61a6861 with SHA-1 27315b3b92
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30686224
Change-Id: I50456e8dec0e24cf0e05cef3dfa7bbc91a83b102
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-09 22:56:51 -08:00
Shraddha Basantwani
3ea69d9d51
[automerger skipped] Add biometric authentication for package modification am: 0634208161
-s ours am: fb65cbfd6e
-s ours am: 9958349551
-s ours
...
am skip reason: Merged-In I0c494e307b02229d751de118abcc89e4e61a6861 with SHA-1 27315b3b92
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30686224
Change-Id: I6db240ff2d04501c4bd2c248f75de860b0774f0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-09 22:56:41 -08:00
mxyyiyi
2782cc9d21
[A11y] Update symbol from '>' to '->' to improve talkback announcement.
...
Fix: 319172554
Test: talkback
Flag: EXEMPT for res update
Change-Id: I35141587492f437170fe2a99b93992205d79976e
2025-02-10 14:47:35 +08:00
Shraddha Basantwani
eaee1eda03
[automerger skipped] Merge "[SPA] Add biometric authentication for package modification" into udc-dev am: 1c5b48c8df
-s ours am: dc3b960f44
-s ours am: 066570ac4f
-s ours
...
am skip reason: skipped by basantwani
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30686364
Change-Id: Idc9e617d0ef9d6d508d784a950088db3d96f77c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-09 22:32:51 -08:00
Shraddha Basantwani
37ea2bcd57
[automerger skipped] Merge "Add biometric authentication for package modification" into tm-qpr-dev am: f459d4073b
-s ours am: 1182123e70
-s ours
...
am skip reason: Merged-In I0c494e307b02229d751de118abcc89e4e61a6861 with SHA-1 27315b3b92
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30686224
Change-Id: I8df6ff7222d1e869cd84ed220c547da97cf7cf1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-09 22:32:48 -08:00
Shraddha Basantwani
9958349551
[automerger skipped] Add biometric authentication for package modification am: 0634208161
-s ours am: fb65cbfd6e
-s ours
...
am skip reason: Merged-In I0c494e307b02229d751de118abcc89e4e61a6861 with SHA-1 27315b3b92
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30686224
Change-Id: I5fc2e7a9e5e51b16248059b0e593b319df4b3606
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-09 22:32:42 -08:00
Shraddha Basantwani
31ec831661
[automerger skipped] Merge "Add biometric authentication for package modification" into tm-qpr-dev am: f459d4073b
-s ours am: 1182123e70
-s ours
...
am skip reason: Merged-In I0c494e307b02229d751de118abcc89e4e61a6861 with SHA-1 27315b3b92
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30686224
Change-Id: I75f90e49d739e7ace94404ee7f68e9bb278b1d49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-09 22:31:13 -08:00
Shraddha Basantwani
9a444e43f7
[automerger skipped] Add biometric authentication for package modification am: 0634208161
-s ours am: fb65cbfd6e
-s ours
...
am skip reason: Merged-In I0c494e307b02229d751de118abcc89e4e61a6861 with SHA-1 27315b3b92
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30686224
Change-Id: I691bc0d2658c29ca6c81cb886f9ca428cb49fcf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-09 22:31:09 -08:00
Shraddha Basantwani
066570ac4f
[automerger skipped] Merge "[SPA] Add biometric authentication for package modification" into udc-dev am: 1c5b48c8df
-s ours am: dc3b960f44
-s ours
...
am skip reason: skipped by basantwani
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30686364
Change-Id: I6bf17f72bd4d18e40d3133c45b9207befa976f46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-09 22:09:06 -08:00
Shraddha Basantwani
1182123e70
[automerger skipped] Merge "Add biometric authentication for package modification" into tm-qpr-dev am: f459d4073b
-s ours
...
am skip reason: Merged-In I0c494e307b02229d751de118abcc89e4e61a6861 with SHA-1 27315b3b92
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30686224
Change-Id: I644e45678227eeb8868f448c6781a6b814e7bda7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-09 22:08:51 -08:00
Shraddha Basantwani
fb65cbfd6e
[automerger skipped] Add biometric authentication for package modification am: 0634208161
-s ours
...
am skip reason: Merged-In I0c494e307b02229d751de118abcc89e4e61a6861 with SHA-1 27315b3b92
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30686224
Change-Id: I4a7745efe000de2fb5c3df3323b88df78804333e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-09 22:08:44 -08:00
Shraddha Basantwani
f459d4073b
Merge "Add biometric authentication for package modification" into tm-qpr-dev
2025-02-09 21:48:53 -08:00
Shraddha Basantwani
dc3b960f44
[automerger skipped] Merge "[SPA] Add biometric authentication for package modification" into udc-dev am: 1c5b48c8df
-s ours
...
am skip reason: skipped by basantwani
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30686364
Change-Id: Iac0fba3656ccfc87eddef86bfcaaf838102c1fe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-09 21:43:57 -08:00
Shraddha Basantwani
0634208161
Add biometric authentication for package modification
...
Add an extra step of Lock Screen for disabling, force-stopping or
uninstalling updates for protected packages
Bug: 352504490, 344865740
Test: atest AppButtonsPreferenceControllerTest
Flag: EXEMPT High Security Bug
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:32e388ad3199de3c062bb2e2db5d3239f934d0eb )
Merged-In: I0c494e307b02229d751de118abcc89e4e61a6861
Change-Id: I0c494e307b02229d751de118abcc89e4e61a6861
2025-02-09 20:25:50 -08:00
Treehugger Robot
50e464f3da
Merge "[Catalyst] Implement metrics/tags for Settings Catalyst" into main
2025-02-09 16:55:47 -08:00
Treehugger Robot
b2c1cf22bd
Merge "[Catalyst] Implement metrics/tags for "Remove Animation"" into main
2025-02-09 16:55:12 -08:00