Commit Graph

682 Commits

Author SHA1 Message Date
chelseahao
61d1b552b1 Disable output switcher on assistant phone UMO.
Bug: 308368124
Test: manual
Change-Id: I8200794e6424f996193ba2181927ec76a43033c8
2024-05-24 13:39:43 +08:00
Xin Li
f0e00b8bf7 Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550
Merged-In: I96574a79eba581db95d387f0d9c9fde2e004c41c
Change-Id: Ib9f2c742f8aa72651ef9eca80a716dd94b9041ea
2024-05-23 14:12:07 -07:00
Chelsea Hao
1302513608 Merge "Use broadcast name instead of program info." into main 2024-05-23 08:08:04 +00:00
chelseahao
7da939b2e3 Use broadcast name instead of program info.
Bug: 331547596
Test: atest
Change-Id: Ie5c35484367a32daeb5020fd03e8653e8c70b4be
2024-05-22 19:01:36 +08:00
Chelsea Hao
33add1b7ee Merge "[Audiosharing] Add tests." into main 2024-05-22 10:02:10 +00:00
chelseahao
83ec0a30f3 [Audiosharing] Add tests.
Test: atest -c com.android.settings.connecteddevice.audiosharing.audiostreams
Bug: 308368124
Change-Id: I8fc458d37cc3456085e1017ca0e6ca86cdae1a9c
2024-05-22 16:39:50 +08:00
Chelsea Hao
be8b707467 Merge "[Audiosharing] Update strings." into main 2024-05-22 02:52:57 +00:00
chelseahao
21d98582ec [Audiosharing] Update strings.
Test: atest -c com.android.settings.connecteddevice.audiosharing.audiostreams
Bug: 322819449
Change-Id: Iba0fa8d3470b896b1f672e01f88d405dcec08fe0
2024-05-21 15:49:19 +08:00
chelseahao
997438d537 [Audiosharing] Create dialog for unsupported device.
Test: atest -c com.android.settings.connecteddevice.audiosharing.audiostreams
Bug: 308368124
Change-Id: Ibe421d29aa1ee05ee736fc8a2665794984a8b6e1
2024-05-21 12:30:20 +08:00
Yiyi Shen
e5bd60a0cf [Audiosharing] Migrate feature from overlay to Settings
Bug: 340379827
Test: atest
Change-Id: I3a88ac1d2f575f3be1f26f617479bbfd25cf6a8e
2024-05-16 05:05:41 +00:00
Ze Li
9d696fe4d8 [ConnectedDevicePage] Clean up flag enable_saved_devices_order_by_recency
Test: atest PreviouslyConnectedDevicePreferenceControllerTest SavedDeviceGroupControllerTest
Bug: 340145121
Change-Id: I2fd6d506b343332edceb0235c1e36345d74cbf55
2024-05-14 11:34:43 +08:00
Kangping Dong
ab7f48dcde [Thread] update Thread settings screen
Per b/327098435 the new Thread settings design proposed
(go/android-thread) is approved.

As a summary, this commit adds a new "connected devices > connection
preference -> Thread" list item and decidated config page for Thread.
Also, we simplified the airplane mode to delegate it to the mainline
code to handle it

Bug: 327098435
Test: atest SettingsUnitTests
Merged-In: Iffbb2471f5a28ec57d30a378f22642fe6ac0b9cc
Change-Id: Iffbb2471f5a28ec57d30a378f22642fe6ac0b9cc
2024-05-09 14:19:13 +08:00
Kangping Dong
d454ac2963 [Thread] update Thread settings screen
Per b/327098435 the new Thread settings design proposed
(go/android-thread) is approved.

As a summary, this commit adds a new "connected devices > connection
preference -> Thread" list item and decidated config page for Thread.
Also, we simplified the airplane mode to delegate it to the mainline
code to handle it

Bug: 327098435
Test: atest SettingsUnitTests
Change-Id: Iffbb2471f5a28ec57d30a378f22642fe6ac0b9cc
2024-05-09 14:04:52 +08:00
Yiyi Shen
9ba24a5d2d Merge "[Audiosharing] Support sharing dialog when click media devices." into main 2024-03-25 02:44:35 +00:00
Yiyi Shen
87629f2470 [Audiosharing] Support sharing dialog when click media devices.
Instead of directly stop audio sharing, clicking on media devices will
lead to different sharing dialogs based on different scenarios. The
scenarios are align to cases when a new device is connected.

Test: atest
Bug: 305620450
Fix: 327259953
Change-Id: Ibb591cb1a59f31c8f0be4f3e72e45378b17e3809
2024-03-22 14:11:11 +08:00
Edgar Wang
1a683a1007 Merge "Listen Developer option enable state" into main 2024-03-22 01:13:17 +00:00
Edgar Wang
26a5c73dc7 Listen Developer option enable state
- When developer option disabled, any page in Developer option
  should be closed.

Bug: 293894425
Test: manual

Change-Id: I392b122e885118770be1af2b51c0c7ef92279e1b
2024-03-21 04:08:08 +00:00
Manish Singh
acafaf94b9 Merge "Support private profile in spinner adapters" into main 2024-03-19 09:54:58 +00:00
Manish Singh
d7ff6fe966 Support private profile in spinner adapters
Screenshot - https://screenshot.googleplex.com/35czwQHeevX75pj
Video - https://drive.google.com/file/d/1LkYPJ3i8llArnQBE3ieLPYMctEOw3xdp/view?usp=sharing&resourcekey=0-j-3-VV4OyXJKBPXwAqJvKg

Bug: 328565911
Bug: 313610609
Bug: 302082696
Test: manual
Test: atest UserAdapterTest
Test: atest StylusDevicesControllerTest
Change-Id: If8395eba5cc73809ab4abc95bc13067451c38b8f
2024-03-15 17:16:57 +00:00
Kangping Dong
b0c7563cdf Merge "[Thread] use dedicated flag for Thread settings" into main am: 33722b512a am: c19a1094d7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3002558

Change-Id: I1c28a4a870b8ded5aad1b32e1e4e7f505d580138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-14 06:19:07 +00:00
Kangping Dong
08dd96fd8f [Thread] use dedicated flag for Thread settings
a larger THREAD_ENABLED_PLATFORM flag which guards all Thread-related
platform changes is used for the Thread settings change. But we need
more flexible control of the UX release timeline. So use a dedicated
THREAD_SETTINGS_ENABLED flag here.

Bug: 329384658
Change-Id: Ib5b3ae3c71ccc890fc46af982b021858774938f3
2024-03-13 18:28:45 +08:00
Treehugger Robot
d89636390f Merge "[Thread] fix wrong kotlin argument name" into main am: dee4388b93 am: 887741ee49
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2984352

Change-Id: I329e07a9a27327d967a9c8de34531f33c847a74b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05 16:04:15 +00:00
Treehugger Robot
887741ee49 Merge "[Thread] fix wrong kotlin argument name" into main am: dee4388b93
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2984352

Change-Id: I309e4d56dc379680d07bf1e28648ca620b824bad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05 15:22:33 +00:00
Angela Wang
6089d3edd6 Merge "Replaces HearingDevicePairingDetail with HearingDevicePairingFragment" into main 2024-03-04 06:53:19 +00:00
Kangping Dong
830d4c0b1e Merge "[Thread] add Thread toggle in settings" into main am: 522e193947 am: abd5f23fe9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2909326

Change-Id: If086f510fe5d3b3f67b4f168f2e0d3f5e0ef98bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 18:25:13 +00:00
Kangping Dong
abd5f23fe9 Merge "[Thread] add Thread toggle in settings" into main am: 522e193947
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2909326

Change-Id: I8640f2cf4a90203972a5db703ebb3e027224c746
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 17:43:51 +00:00
Kangping Dong
e5c4c6e677 [Thread] fix wrong kotlin argument name
Fixes build warning:
```
the corresponding parameter in the supertype 'LifecycleEventObserver' is named 'source'. This may cause problems when calling this function with named arguments.
    override fun onStateChanged(lifecycleOwner: LifecycleOwner, event: Lifecycle.Event) {
```

Bug: 327098435
Change-Id: I9c50ab508cd39bf2eda02c423deeef9ca5342f4f
2024-03-01 00:49:03 +08:00
Kangping Dong
5fc01ddd6e [Thread] add Thread toggle in settings
Allows a user to disable or enable Thread network / radio from
settings.

In this commit, a toggle is added to Settings > Connected devices >
Connection preferences to control Thread state. See the screenshots
below:
1. Thread is on: https://screenshot.googleplex.com/7FqqbzRX6rGwvSb
2. Thread is off: https://screenshot.googleplex.com/AmfRAhzuukULAAG
3. Thread is disabled by airplane mode: https://screenshot.googleplex.com/7zcesyomrveCqFE
4. Thread is searchable: https://screenshot.googleplex.com/9yFL2jeSuEhJwrS

Requirements:
1. the in-take bug: b/327098435
2. See the screenshot above
3. Test with `atest SettingsUnitTests` and manual tests
4. +2 from Yuwen
5. Flagged by "com.android.net.thread.platform.flags.Flags.thread_enabled_platform"
6. It doesn't need B&R, no preferences are added (the state is in
   Android framework (mainline module))
7. Confirmed searchable
8. Code written in Kotlin

Bug: 296990038
Bug: 319077562
Test: atest SettingsUnitTests
Change-Id: Ifa2264b8e59a5112290fd0224cb75ad228732077
2024-02-29 18:05:49 +08:00
Angela Wang
6e78a34d9c Replaces HearingDevicePairingDetail with HearingDevicePairingFragment
The new pairing page includes new UI for "See more devices" buttton and
can show MFi + ASHA devices in the pairing list while these devices only
advertise MFi HAS uuid in pairing mode.

As allowed by "Flag Cleanup Policy", this change finishes the rollout of trunkfood flag new_hearing_device_pairing_page by defaulting to the "true" state.

Bug: 307473972
Test: atest HearingAidPairingDialogFragmentTest
Test: atest AddDevicePreferenceControllerTest
Change-Id: I6c3377d535139d62791548557c581317d1878e9d
2024-02-27 14:28:59 +00:00
Yiyi Shen
dd7626f55b [Audiosharing] Clean up audio sharing from Settings
Bug: 324023639
Test: atest
Change-Id: Ie73790442f39af60b125bbd48182a700bb0b290a
2024-02-26 17:24:53 +08:00
Yiyi Shen
42b8fbb74f [Audiosharing] Impl audio sharing feature provider in Settings
Add createAvailableMediaDeviceGroupController interface to provide
different controller in Settings and SettingsGoogle.

Bug: 324023639
Test: atest
Change-Id: Ibf2ea2620c878e609eb937ff6947f5aaa0b89e7a
2024-02-24 07:25:36 +00:00
Yiyi Shen
a2577fd60e [Audiosharing] Impl audio sharing feature provider in Settings
Bug: 324023639
Test: manual
Change-Id: I4005ea8fbc0983a833f5a7dee2815f09eab48d3c
2024-02-20 08:06:55 +00:00
Arnab Sen
e221abaa48 Stylus: Introduce Show Stylus Hover Pointer Setting (2/2)
Currently, the stylus hover icon can only be shown when
config_enableStylusPointerIcon is set to true. This means that the
users do not have a choice of turning the feature on or off.

This CL introduces the capability to do the same. This CL adds the
toggle in the StylusDevicesController to be shown when stylus is
connected. The toggle is mapped to the STYLUS_POINTER_ENABLED secure
setting which InputManagerService listens to turn on and off the stylus
pointer icon.

Test: manual
Steps:
1. Change the value of config_enableStylusPointerIcon as true.
2. Build the images and flash it to a stylus supporting device.
3. After the device is booted, hover over the screen, the stylus
   pointer should appear.
4. Go to Settings > Connected Devices > Stylus and tap on
   "Show pointer while hovering" toggle.
5. Try hovering over the screen, check no pointer icon is shown
6. Repeat Step#4, check that stylus pointer appears.

Run
- make RunSettingsRoboTests \
      ROBOTEST_FILTER=StylusDevicesControllerTest
- atest SettingsProviderTest

Change-Id: Idfff9b4307370cc510a5f94bd57777c30c96e854
2024-02-07 17:46:18 +00:00
Yiyi Shen
10bddfd334 [Audiosharing] Avoid dialog flickering for same bt device group.
Before this change, the dialog will dismiss and show up again if the
second bud of the same group is connected.

In this change, StopDialog and JoinDialog will only update the message
and event listener when the dialog is triggered by another device with the same group id or the new bt device with different group id. (No dismiss and show); DisconnectDialog will only dismiss and show again when a new bt device with different group id is connected and update the event listener when another device with the same group id connected.

Also dismiss the dialog when the triggering device disconnect or join
the sharing.

Test: atest
Bug: 305620450
Change-Id: I798812101cefb24185d76d56f78eae27712dd7a6
2024-02-06 11:52:58 +08:00
Yiyi Shen
e96833943a [Audiosharing] Handle fallback device for calls and alarms.
Test: atest
Bug: 305620450
Change-Id: I1c7a49b6aed7d47b7fdbcc6b475b8e99edc52443
2024-02-02 13:32:50 +08:00
Yiyi Shen
b0ba9959cd Merge "[Audiosharing] UI refinement." into main 2024-01-29 14:11:38 +00:00
Yiyi Shen
5e8720434b [Audiosharing] UI refinement.
1. Add top summary for Audio sharing page.
2. Move Audio sharing entrance to the second place on Connection
   preferences page.
3. Make Audio sharing page searchable.
4. Add On/Off summary to Audio sharing preference on Connection
   preference page.

Test: atest
Bug: 305620450
Change-Id: I00019e53563afc0a539934fbdfa949c3401e78b9
2024-01-29 19:03:59 +08: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
chelseahao
9f23b4e45f [Audiosharing] Implement name and password row.
Bug: 308368124
Test: manual
Change-Id: I86d0e771ece0ea7003a50ee0cc9305814d85fecb
2024-01-26 00:59:44 +00:00
Ze Li
7ef6a7dd4d Merge "[Connected devices page] Reorder devices by most recently used." into main 2024-01-24 09:02:37 +00:00
Ze Li
41b12fe8eb [Connected devices page] Reorder devices by most recently used.
Order the saved bluetooth devices by most recently connected in connected devices settings page.

Test: atest: com.android.settings.connecteddevice.SavedDeviceGroupControllerTest, com.android.settings.connecteddevice.PreviouslyConnectedDevicePreferenceControllerTest
Bug: 306160434
Change-Id: Id5ad8555a026d775d96ada37f989b4346336af93
2024-01-23 08:14:29 +00:00
Yiyi Shen
92930341c4 Merge "[Audiosharing] Use LE audio profile as fallback to get group id." into main 2024-01-22 11:46:19 +00:00
Yiyi Shen
b3331f3ea4 [Audiosharing] Use LE audio profile as fallback to get group id.
For non-CSIP LE audio device, use LE audio profile to get group id.

Also, did some refinement in this change.
1. Add more log
2. Use context#getMainExecutor instead, since postOnMainThread is
   deprecated.

Test: manual
Bug: 305620450
Bug: 319723439
Change-Id: I8056b2e7b6ab37915a518ad2290a0a7fb7671c18
2024-01-22 16:42:33 +08:00
chelseahao
9213529cc1 [Audiosharing] Create confirmation to join audio.
Bug: 305620450
Test: manual
Change-Id: I7bb8ed290808115cb76b59f3bfdc52f09806034d
2024-01-22 07:11:20 +00:00
Yiyi Shen
a4cf715181 [Audiosharing] Set/get compatibility config by toggle.
Also use startPrivateBroadcast() to start the broadcast with
compatibility config stored in SettingsProvider.

Test: manual
Bug: 305620450
Bug: 292538935
Change-Id: Iff067833fb0668531aa32957b414585751f2bcee
2024-01-22 14:09:48 +08:00
chelseahao
7bc4ea01d1 [Audiosharing] Impl of two error dialogs.
Bug: 305620450
Test: manual
Change-Id: I5bd4a4b2ab54c382f325c7a6bb4a3029d47786e0
2024-01-19 03:02:48 +00:00
Yiyi Shen
ce27ff1efa Merge "[Audiosharing] Add toggle to improve sharing compatibility." into main 2024-01-17 06:47:17 +00:00
Angela Wang
3c71a5ff22 Merge changes from topic "ha-new-pairing" into main
* changes:
  New hearing device pairing page (2/2): MFi devices
  New hearing device pairing page (1/2)
2024-01-16 09:41:37 +00:00