Bill Yi
eba2637793
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 3a826215dc
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26006445
Change-Id: I37010d68702d384ef4b9df81c6aaf668e89cde0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-28 22:25:21 +00:00
Bill Yi
e560ec5489
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1bd5f53e95
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26006445
Change-Id: Id3d8cc9e9735dc40b903dce6e89b5b1d4d43ee0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-28 22:25:10 +00:00
Bill Yi
b7e3de76b2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f768f6a25
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26006443
Change-Id: I205e81399daab815bdcd0e2706210d18c6cab736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-28 22:24:53 +00:00
Bill Yi
3a826215dc
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2024-01-28 21:47:00 +00:00
Bill Yi
d9e20b7d62
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-01-28 20:58:00 +00:00
Bill Yi
1fa6480fdc
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-01-28 20:58:00 +00:00
Bill Yi
8de819f39a
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-01-28 20:58:00 +00:00
Chun-Ku Lin
5a921fffb7
Merge "Save the user preferred shortcut on Edit A11yShortcut screen" into main
2024-01-28 11:17:10 +00:00
Chun-Ku Lin
f9ae13a73d
Save the user preferred shortcut on Edit A11yShortcut screen
...
We saved the user preferred shortcut in the a11y feature's detail page.
Since now the Edit A11yShortcut screen is a standalone screen, we might
want to keep the existing behavior to update the user preferred shortcut
types when the edit screen is shown or when the shortcut settings are
updated.
Bug: 300302098
Test: atest
Test: manual
- Go to an a11y feature page and open the Edit shortcut screen
- Remove all selected shortcut option
- Select volume key shortcut option, and deselect volume key
shortcut option
- Go to home page and close the Settings app
- Go to the same a11y feature page and click on the shortcut toggle
- Expect the volume key shortcut is turned on
Flag: ACONFIG
com.android.settings.accessibility.edit_shortcuts_in_full_screen
TRUNKFOOD
Change-Id: I2c92ec56d6e45317406f3a4b8ef8f076c398df7f
2024-01-28 00:21:31 +00:00
Hakjun Choi
833714434a
Remove unnecessary term 'all' from the API name
...
getAllSatellitePlmnsForCarrier > getSatellitePlmnsForCarrier
The word 'all' is unnecessary here, it's already implied by PLMN being a plural.
Bug: 320462244
Test: atest SatelliteManagerTet, NetworkSelectSettingsTest
Change-Id: Idb6439176be55a787f27f298c211deef6900c7f9
2024-01-27 20:56:41 +00:00
Hakjun Choi
fd58065cdb
Merge "Reflect satellite api refactoring to Settings" into main
2024-01-27 04:22:26 +00:00
Fan Wu
4fd3d8d4e6
Merge "Fix WifiDialogActivityTest legacy issue" into main
2024-01-27 02:13:44 +00:00
Alice Kuo
8eb26342de
Merge changes I96776484,Ic2ea10d9 into main
...
* changes:
Add BluetoothLeAudioModePreferenceControllerTest
Change the switcher to switch LE audio mode with broadcast
2024-01-26 23:34:28 +00:00
Bill Yi
f1f5f048d9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a86c8e77f
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26006192
Change-Id: Ia7b662a9e1480b9c403dc71192eda0b7f03cae66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-26 23:16:17 +00:00
Chun-Ku Lin
0d1418ae91
Merge "Replace ShortcutType with UserShortcutType to reduce duplicate declaration." into main
2024-01-26 22:26:16 +00:00
Faye Yan
b170858886
Merge "Revert "Add the second toggle for the egress data permission on voice activation"" into main
2024-01-26 22:16:02 +00:00
Vineel Sadineni
245cb5f6d6
[automerger skipped] Merge "Make MoreOptionsScope abstract class" into main am: 62d6ccd106
am: 7b16a62bb2
-s ours
...
am skip reason: Merged-In Iced9df83f600c86cc409abc040fb9ace0dcedf1e with SHA-1 97d36b771a
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2928196
Change-Id: I8ed92b8919ee5e45e6d5c0dda47edf83da83025c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-26 20:19:35 +00:00
Vineel Sadineni
7b16a62bb2
Merge "Make MoreOptionsScope abstract class" into main am: 62d6ccd106
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2928196
Change-Id: If7656674b4675eec8de6d8bca635955a66e7760c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-26 19:20:01 +00:00
Becca Hughes
6e19c653a8
Merge "Add try/catch to handle invalid settings activity" into main
2024-01-26 18:58:30 +00:00
Faye Yan
97e198b096
Revert "Add the second toggle for the egress data permission on voice activation"
...
This reverts commit a0f67e8591
.
Reason for revert: Fedhot team cancel the egress data permission
Change-Id: Ib740896b41dc3eea1d196eecaf0abe13eff842a4
2024-01-26 18:36:23 +00:00
Faye Yan
68bc311bec
Merge "Revert "Fix the op mode dependency for the second toggle:"" into main
2024-01-26 18:35:41 +00:00
Vineel Sadineni
62d6ccd106
Merge "Make MoreOptionsScope abstract class" into main
2024-01-26 18:10:18 +00:00
Becca Hughes
09fa333f47
Add try/catch to handle invalid settings activity
...
Change-Id: I20d9480fd3bfe14fe4e85ed2937aaba3df09302d
Test: make
Bug: 322287971
2024-01-26 17:51:55 +00:00
Weng Su
5510f605ce
Fix WifiDialogActivityTest legacy issue
...
- Add @LooperMode(LooperMode.Mode.LEGACY) to fix loop issue.
Bug: 314867581
Flag: None
Test: unit test
atest -c SettingsRoboTests
Change-Id: Ib1676a8502005870e9944fc654801916fe1bb945
2024-01-27 00:09:54 +08:00
Hakjun Choi
7f2f0612d1
Reflect satellite api refactoring to Settings
...
Removed the word Satellite from all the method names might improve brevity and readability excluding cases that cause confusion.
Bug: 297933128
Test: manual test using testSatelliteApp
Change-Id: Ia817b8bf531031c28264750c03a6f7004ed81aa5
2024-01-26 13:26:25 +00:00
Alice Kuo
fdbdc16285
Add BluetoothLeAudioModePreferenceControllerTest
...
Bug: 273153850
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioModePreferenceControllerTest
Change-Id: I967764848c953a9156981e121e924d5a18617d2f
2024-01-26 12:25:10 +00:00
Alice Kuo
37e1fef9d4
Change the switcher to switch LE audio mode with broadcast
...
Change the previous toggle design to list option for broadcast feature.
The new toggle change is only applied as broadcast feature enabled whcih
is behind a feature flag.
Bug: 273153850
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioPreferenceControllerTest
Change-Id: Ic2ea10d9d9529a2d413525c1b660f8fbac371502
2024-01-26 20:22:45 +08:00
Treehugger Robot
5fe4714851
Merge "Restrict WifiDialogActivity" into main
2024-01-26 10:56:00 +00:00
Weng Su
51fa3d798a
Restrict WifiDialogActivity
...
- Don't show WifiDialogActivity if user has DISALLOW_ADD_WIFI_CONFIG
Fix: 299931761
Bug: 314867581
Flag: None
Test: manual test with TestDPC
atest -c SettingsRoboTests:WifiDialogActivityTest
Change-Id: Icbb8f45922ded163208976be9c2816060dcf09f1
2024-01-26 18:01:28 +08:00
Chelsea Hao
5e7c054b92
Merge changes I99011feb,Ie066077f,I44e631cb into main
...
* changes:
[Audiosharing] Handle source remove plus small refactor.
[Audiosharing] Some UI tweaks (e.g, sort by RSSI)
[Audiosharing] Add button action in detail page.
2024-01-26 09:48:42 +00:00
chelseahao
a6680963fa
[Audiosharing] Handle source remove plus small refactor.
...
Bug: 308368124
Test: manual
Change-Id: I99011feb762445e75652cbe59c2653dced7dd4f7
2024-01-26 16:48:21 +08:00
chelseahao
8b5da73e4d
[Audiosharing] Some UI tweaks (e.g, sort by RSSI)
...
Bug: 308368124
Test: manual
Change-Id: Ie066077f6ef47a57b9fb1c85bc7200498dcae093
2024-01-26 16:46:23 +08:00
chelseahao
8a3ebe25e0
[Audiosharing] Add button action in detail page.
...
Bug: 308368124
Test: manual
Change-Id: I44e631cb75af432965d2221e71676146ea1537b6
2024-01-26 16:46:23 +08:00
SongFerng Wang
5729057880
Merge "SIMs page enhancement" into main
2024-01-26 07:53:30 +00:00
Faye Yan
19a0292230
Revert "Fix the op mode dependency for the second toggle:"
...
This reverts commit 78f99c6a67
.
Reason for revert: The Fedhot team cancel the egress data permission
Change-Id: I57c2fad0450f5f5ad36a5ff8a39ed42603b09d49
2024-01-26 04:23:30 +00:00
SongFerngWang
685befa86a
SIMs page enhancement
...
This is for the Sim onboarding UI enhancement
- create new SIMs spa UI
- hide the Call & SMS when flag is on
Bug: 318310357
Bug: 298898436
Bug: 298891941
Test: munally test
Change-Id: Iaecb8fe435b26f2952263024c93c8719feda96a4
2024-01-26 04:20:01 +00:00
Chelsea Hao
911d85a9fd
Merge "[Audiosharing] Implement name and password row." into main
2024-01-26 02:37:26 +00:00
Fan Wu
24045ade0c
Merge "Fix ProfileSelectLocationFragmentTest" into main
2024-01-26 01:25:00 +00:00
chelseahao
9f23b4e45f
[Audiosharing] Implement name and password row.
...
Bug: 308368124
Test: manual
Change-Id: I86d0e771ece0ea7003a50ee0cc9305814d85fecb
2024-01-26 00:59:44 +00:00
Riley Jones
317173b7cd
Merge "Created a dedicated activity for EditShortcutsPreferenceFragment. This will allow it to be reached via intent." into main
2024-01-25 21:33:33 +00:00
Chaohui Wang
745c69b76a
Make MoreOptionsScope abstract class
...
Bug: 321724969
Test: m Settings
Test: unit test
Merged-In: Iced9df83f600c86cc409abc040fb9ace0dcedf1e
Change-Id: Iced9df83f600c86cc409abc040fb9ace0dcedf1e
2024-01-25 20:22:45 +00:00
Massimo Carli
4db2698714
Merge "Use custom default font_scale behing flag" into main
2024-01-25 18:06:13 +00:00
Yanting Yang
6e3428c75f
Merge "Support dynamic search index for App pinning" into main
2024-01-25 15:01:38 +00:00
Vaibhav Devmurari
caa9338d81
Merge "Add Slow keys A11Y settings to PK settings page" into main
2024-01-25 14:50:17 +00:00
Yuanru Qian
f7f58bd7c8
Merge "Update the string for CSIP pairing dialogs" into main
2024-01-25 05:55:36 +00:00
Bill Yi
f1be6474b4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic2ca1b97da7771e177359bf971959037494ae22a
2024-01-24 21:47:56 -08:00
Bill Yi
1bd5f53e95
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I27ed3d245273b235527cbc3cbe03e21606d03407
2024-01-24 21:45:56 -08:00
Bill Yi
2fbad82ae4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie1b63e2313c8ba935878085988c5772541b5263d
2024-01-24 21:44:11 -08:00
Bill Yi
1f768f6a25
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I87f330f554976c401e0182499ba26e44e8d59475
2024-01-24 21:42:42 -08:00
Bill Yi
f49a0a2c21
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ief3e427f014159138ae33d9ff4f20cacf8267df7
2024-01-24 21:41:53 -08:00