Treehugger Robot
30d593d55f
Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-dev am: e0e72a57b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490211
Change-Id: Ia080e518c2170904c52fde02403ee63c9b55e8d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 20:15:52 +00:00
Treehugger Robot
ad1e470fc0
[automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-dev am: ead69f3d43
-s ours
...
am skip reason: Merged-In I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1 with SHA-1 6f1c499e57
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30487387
Change-Id: I061448f1d049252139864636361c59710659f2ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 20:15:42 +00:00
Adam Bookatz
9d81e7d2e5
[automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 44a35ac07b
-s ours
...
am skip reason: Merged-In I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1 with SHA-1 6f1c499e57
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30487387
Change-Id: Ic5289feb780f3de57608de58b86d7250da337727
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 20:15:39 +00:00
Adam Bookatz
39011f67c4
Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 31e69deb28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490211
Change-Id: Iaa3e5c9dc2b5d0f677391e0b56c0c905cb553118
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 20:15:37 +00:00
Treehugger Robot
e716dcdb41
[automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-qpr-dev am: f07deaf5b4
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30489977
Change-Id: If436584157bac594504bc26ff60373850b9468d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 20:15:13 +00:00
Adam Bookatz
662804b142
[automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 9882f43d9c
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30489977
Change-Id: I738257055d7155884ff8524f46d1edb25dda1dfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 20:15:08 +00:00
Treehugger Robot
00bc2566b2
Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into udc-dev am: 31af2ff68c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30489978
Change-Id: I24391d248a2af734c39f1a9aa5ece22203bdb23c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 20:15:03 +00:00
Adam Bookatz
22fe77ca00
Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 6e413c4cff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30489978
Change-Id: Ic8113dd1061984e51174b779f6d6e74dfc2a091a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 20:14:59 +00:00
Treehugger Robot
8cfbd8aa9b
Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-qpr1-dev
2024-12-03 19:57:12 +00:00
Treehugger Robot
31af2ff68c
Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into udc-dev
2024-12-03 19:52:15 +00:00
Treehugger Robot
ed4d949e5a
Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into udc-qpr-dev
2024-12-03 19:51:15 +00:00
Treehugger Robot
f07deaf5b4
Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-qpr-dev
2024-12-03 19:51:15 +00:00
Bill Yi
cbed4b18cb
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-12-03 19:46:35 +00:00
Bill Yi
2f839e5531
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-12-03 19:46:35 +00:00
Treehugger Robot
e0e72a57b7
Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-dev
2024-12-03 19:45:29 +00:00
Treehugger Robot
ead69f3d43
Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-dev
2024-12-03 19:31:03 +00:00
Joshua Mccloskey
ec0086ef43
Merge "Fast enroll" into main
2024-12-03 18:32:52 +00:00
Xin Li
b250c14dc0
[automerger skipped] Merge "Merge ab/AP4A.241205.013 into aosp-main-future" into aosp-main-future am: fe5a8d38f3
-s ours
...
am skip reason: Merged-In I0d4c48ef6debfa82597db48a4320b0500f330b1b with SHA-1 b246d2e815
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30048027
Change-Id: Icc7d8761508df6018ba629b43c077692a9a09cbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 18:23:15 +00:00
Xin Li
8298bef503
[automerger skipped] Merge ab/AP4A.241205.013 into aosp-main-future am: b6cfdb21a8
-s ours
...
am skip reason: Merged-In I0d4c48ef6debfa82597db48a4320b0500f330b1b with SHA-1 b246d2e815
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30626027
Change-Id: I8883de8fc61a3113c71d01322ed349db9256edce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-12-03 18:22:03 +00:00
Xin Li
fe5a8d38f3
Merge "Merge ab/AP4A.241205.013 into aosp-main-future" into aosp-main-future
2024-12-03 16:50:21 +00:00
Treehugger Robot
351f6258d8
Merge "Satellite UX - Add learn more into Footer" into main
2024-12-03 12:57:03 +00:00
Tom Hsu
13c6cad5dc
Merge "Fix crash due to no Satellite" into main
2024-12-03 11:30:08 +00:00
tomhsu
ceac8c1dde
Satellite UX - Add learn more into Footer
...
Flag: com.android.settings.flags.satellite_oem_settings_ux_migration
Bug: 378408877
Test: atest pass
Test: Manual test pass.
Change-Id: I27f2c82fe5d6c34cf204472c4199538326d6aec4
2024-12-03 11:21:18 +00:00
tomhsu
9329684c86
Fix crash due to no Satellite
...
- AutoSelectPreferenceController get null pointer exception
Flag: EXEMPT bug fix
Fix: b/381995900
Test: atest pass
Change-Id: Iadbd83825cdfbc0aabd85b79e9ad7043f172a8a1
2024-12-03 09:02:31 +00:00
Jacky Wang
10f0cd821c
[Catalyst] Migrate "Use Wi-Fi calling"
...
Bug: 372732219
Flag: com.android.settings.flags.catalyst_wifi_calling
Test: devtool
Change-Id: I3183b1234b4129aa0cf0e5bc5324596a08f21195
2024-12-03 16:43:15 +08:00
Treehugger Robot
0496fc2de5
Merge "[Catalyst] Migrate Wi-Fi switch preference" into main
2024-12-03 08:31:30 +00:00
Treehugger Robot
a8085cdc20
Merge "[Catalyst] Fix NPE when open wifi calling screen" into main
2024-12-03 08:17:24 +00:00
Ze Li
c8d926c4d0
Merge "[Connected devices page] Move the refresh logic to main thread." into main
2024-12-03 08:06:04 +00:00
Treehugger Robot
33066946e8
Merge "Ignore test case to avoid post submit failed" into main
2024-12-03 07:36:51 +00:00
Jacky Wang
9011a4f965
[Catalyst] Fix NPE when open wifi calling screen
...
Bug: 379961379
Flag: com.android.settings.flags.catalyst_wifi_calling
Test: manual
Change-Id: I7c58ee786f5ca8ad76624d2c33d0375b3a0f1993
2024-12-03 14:55:22 +08:00
Weng Su
9faf231dc4
[Catalyst] Migrate Wi-Fi switch preference
...
NO_IFTTT=Add Catalyst preference
Bug: 372733639
Flag: com.android.settings.flags.catalyst_internet_settings
Test: Manual testing
atest -c NetworkProviderSettingsTest \
NetworkProviderScreenTest
atest -c WifiSwitchPreferenceTest
Change-Id: Ic6023907608e831d0a946005dd0eb6fd88b301c0
2024-12-03 06:51:18 +00:00
tomhsu
50e695fdb6
Ignore test case to avoid post submit failed
...
Flag: EXEMPT bug fix
Fix: b/381904824
Test: atest pass
Change-Id: Ie8401c2ac887726090812236882d23ae710c30c8
2024-12-03 05:58:00 +00:00
Ze Li
7c11a45735
[Connected devices page] Move the refresh logic to main thread.
...
As the caller of adding or removing devices may not be performing on background thread, sync problem could occur. So here we make sure all updates to UI happens on the main thread.
Test: atest: com.android.settings.connecteddevice.PreviouslyConnectedDevicePreferenceControllerTest
Bug: 365044575
Flag: EXEMPT bugfix
Change-Id: I5b697acb7cf7469fe3bbff33b820b4e9f4c5104f
2024-12-03 13:54:57 +08:00
Treehugger Robot
a975808251
Merge "[Catalyst] Use lifecycleScope for BatterySaverPreference" into main
2024-12-03 04:12:59 +00:00
Bill Yi
880b463a4a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie55b1454e1863698c72def1053a0a9568677b092
2024-12-02 19:18:07 -08:00
Bill Yi
dab1ba5e28
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2910772e97f8cca308d9d4e5198f8f8857db9d06
2024-12-02 19:16:01 -08:00
Treehugger Robot
25ff6453fb
Merge "Touchpad: remove tap dragging flag" into main
2024-12-03 02:33:57 +00:00
Shaowei Shen
39d682a67a
Merge "[Physical Keyboard] Add intent support for PK layout setting page" into main
2024-12-03 01:23:19 +00:00
Jacky Wang
0f591ca220
[Catalyst] Use lifecycleScope for BatterySaverPreference
...
NO_IFTTT=Catalyst only
Bug: 377993674
Flag: com.android.settings.flags.catalyst_battery_saver_screen
Test: manual
Change-Id: Ie66882cd74300ced4914cd2c67fe130f66530100
2024-12-03 07:36:01 +08:00
Harry Cutts
e628248bab
Touchpad: remove tap dragging flag
...
This feature has now launched, so we can remove the flag.
Bug: 349562564
Test: toggle tap dragging setting, check tap dragging works when it's
enabled but not when it's disabled
Flag: EXEMPT removing com.android.hardware.input.touchpad_tap_dragging
Change-Id: I6454b57b97f93e5cccfafc784f3fdc63a16f80ed
2024-12-02 21:24:54 +00:00
Riley Jones
acccaff128
Cleaning up quick settings flag in Settings app
...
Removes all instances of a11y_qs_enabled. Any code that would be nontrivial to remove has been deprecated for later cleanup.
Test: atest com.android.settings.accessibility
Flag: EXEMPT flag cleanup
Bug: 367414968
Change-Id: I81f3c9cee377535eaa552a170d58ec1a79d1da65
2024-12-02 20:38:10 +00:00
Matías Hernández
aaee1a1511
Merge "(Once more) fix minimum height of mode name edit box for a11y" into main
2024-12-02 17:41:06 +00:00
Joshua McCloskey
a2085f18b7
Fast enroll
...
Test: manual
Bug: 375320734
Flag: com.google.android.settings.flags.pixel_fingerprint_enroll
Change-Id: Iaf3acfca8471165514660a2403e69be161392501
2024-12-02 17:07:59 +00:00
Treehugger Robot
6b98c4e74b
Merge "[SPA] Add biometric authentication for package modification" into main
2024-12-02 15:39:51 +00:00
Matías Hernández
b3468ca88a
(Once more) fix minimum height of mode name edit box for a11y
...
We had fixed this before and then regressed when moving to TextInputLayout, so added a proper test this time.
Fixes: 380207192
Test: atest ZenModeEditNamePreferenceControllerTest
Flag: android.app.modes_ui
Change-Id: Ic25b0a5a6997e7b3bb26bf26ed7e8e92654a1c11
2024-12-02 16:06:58 +01:00
Nikki Moteva
7313080e75
Merge "Settings: Fix the a11y focus issues in App Notifications subpage" into main
2024-12-02 10:57:46 +00:00
Treehugger Robot
f92c187b11
Merge "[Catalyst] Ring volume migration (2/n)" into main
2024-12-02 10:41:39 +00:00
Shraddha Basantwani
32e388ad31
[SPA] Add biometric authentication for package modification
...
Add an extra step of Lock Screen for disabling, force-stopping or
uninstalling updates for protected packages
UI Change Details : https://drive.google.com/drive/folders/1w7gKTmCxQ_j-9GQnIpEfF5_gmQ27b8l_?resourcekey=0-brLdN8VfqVPGm2FMwfrmkQ&usp=drive_link
Bug: 352504490, 344865740
Test: atest AppButtonsPreferenceControllerTest PackageInfoPresenterTest
Flag: EXEMPT High Security Bug
Change-Id: I0c494e307b02229d751de118abcc89e4e61a6861
2024-12-02 09:36:05 +00:00
shaoweishen
b7616da05c
[Physical Keyboard] Add intent support for PK layout setting page
...
This is part of feature for keyboard setting update, which allows gBoard to deep link to layout picker page.
document: go/deeplink_pk_layout_picker
Change-Id: I4277e175be7eed338f855e8144b5531c614e2c04
Bug: 318594345
Flag: com.android.settings.keyboard.keyboard_and_touchpad_a11y_new_page_enabled
Test: verified on Device
2024-12-02 09:12:25 +00:00
Jacky Wang
f96ae34080
Merge changes from topic "catalyst-sims" into main
...
* changes:
[Catalyst] Migrate "Mobile data"
[Catalyst] Migrate SIMs entry point
2024-12-02 08:32:19 +00:00