Commit Graph

682 Commits

Author SHA1 Message Date
Chelsea Hao
fe934dd097 Merge "[Audiosharing] Hide / show audio streams category." into main 2023-11-24 05:21:00 +00:00
chelseahao
78a667e7ca [Audiosharing] Hide / show audio streams category.
Only show when there is an active LE buds connecting, and the source is
not currently broadcasting.

Bug: 308368124
Test: Manual
Change-Id: I2cc172a66648901ac8a7e49c5aac734b6bbc7e33
2023-11-23 11:03:16 +00:00
Yiyi Shen
6ab64aa71f Merge "[Audiosharing] Set earlist connected device active in sharing." into main 2023-11-23 09:39:44 +00:00
Yiyi Shen
b82f290fce [Audiosharing] Set earlist connected device active in sharing.
Flagged with enable_le_audio_sharing

Bug: 305620450
Test: Manual
Change-Id: I8e0132f3d982fe2723581cd2aafd3cb9a9ed409c
2023-11-23 15:40:50 +08:00
chelseahao
1e0301d70f [Audiosharing] Move getSummary to a bg thread.
Bug: 308368124
Test: Manual
Change-Id: I6d521681ce8835e5187c43f6ec930fb119f46674
2023-11-23 05:41:06 +00:00
Chelsea Hao
73a95d165a Merge "[Audiosharing] Create preference for audio streams" into main 2023-11-23 03:19:40 +00:00
Yiyi Shen
f4d4683a3c Merge "[Audiosharing] Add device volume controls." into main 2023-11-22 12:57:20 +00:00
chelseahao
1cf98e0046 [Audiosharing] Create preference for audio streams
This preference will optionally show a lock icon on the right.

Bug: 308368124
Test: Manual
Change-Id: Ifd899da48a499e4d963f0b8981f8d5f55070d46f
2023-11-22 10:57:28 +00:00
Chelsea Hao
11033433ee Merge "[Audiosharing] Impl "Listen with" row." into main 2023-11-22 10:56:43 +00:00
Yiyi Shen
4b2c440715 [Audiosharing] Add device volume controls.
Flagged with enable_le_audio_sharing

Bug: 305620450
Test: Manual
Change-Id: I5330cf3b3b4497af22820657b61279070f9c4af1
2023-11-22 10:32:11 +00:00
chelseahao
43611adcf3 [Audiosharing] Impl "Listen with" row.
This row will show the currently connected and active LE buds. There
should be no more than one pair.

Bug: 308368124
Test: Manual
Change-Id: I281d7f7c6debaeb34b8206fe587cb776ea0eb0ec
2023-11-22 09:29:28 +00:00
Yiyi Shen
ddebe7293b [Audiosharing] Reimpl audio sharing main switch
New flow: Automatically add sharing source to connected active device eligible for
audio sharing. And then pop up the dialog for users to choose an additinal eligible device
to share audio.

Old flow: Pop up the dialog first and add sharing source after user
interact to the dialog.

Flagged with enable_le_audio_sharing

Bug: 305620450
Test: Manual
Change-Id: If0d1609b2677ca9ecae926c198f305fd1f4e34d3
2023-11-22 11:38:01 +08:00
Treehugger Robot
e8f6a7572c Merge "Handle cached bluetooth device with stylus pref" into main 2023-11-21 12:59:39 +00:00
Ajinkya Chalke
dcb5bc6da5 Handle cached bluetooth device with stylus pref
- Checking whether a stylus has a tail button key is not possible when
  the device is cached, so assume that it does.
- Updated StylusDevicesControllerTest to use SwitchPreferenceCompat as
  there were unrelated tests that were failing. The actual test that
  would've caught the bug only started failing after the unrelated test
  failures were fixed.

Bug: 311334474
Test: atest StylusDevicesControllerTest
Flag: N/A
Change-Id: Iee2899bf0a77a70f4a4f76833f485d511d919c40
2023-11-21 11:15:29 +00:00
Yiyi Shen
1e71a03e65 [Audiosharing] Sort sharing candidates in Utils.
The active device is placed before the inactive one.
The bonded device is placed before the unbonded one.
The device with earlier bond timestamp is placed before the later one.
Otherwise, the device is ordered by name.

Flagged with enable_le_audio_sharing

Bug: 305620450
Test: Manual
Change-Id: Ie1eea7361fbed1635313b92790cec034cf669bbf
2023-11-21 07:59:14 +00:00
Yiyi Shen
d1f0efc282 [Audiosharing] Impl active device switch for calls and alarms
Flagged with enable_le_audio_sharing

Bug: 305620450
Test: Manual
Change-Id: Id1e417cd1ae48bbb4ddebb4b30e2001e18bef7ee
2023-11-16 06:03:03 +00:00
Yiyi Shen
83798bfbc5 [Audiosharing] Add a util class for audio sharing.
Flagged with enable_le_audio_sharing

Bug: 305620450
Test: Manual
Change-Id: Iea5d4faa83eeef2d7104b9c31679e9226b75f4a6
2023-11-15 11:22:41 +00:00
Yiyi Shen
07f2b54496 Merge "[Audiosharing] Impl a base controller for audio sharing page." into main 2023-11-15 06:43:07 +00:00
Yiyi Shen
21ed1b0358 [Audiosharing] Impl a base controller for audio sharing page.
The preference controllers attached to audio sharing page will extends
this base controller so that their visibility will be updated together
depending on the main switch state.

Flagged with enable_le_audio_sharing

Bug: 305620450
Test: Manual
Change-Id: I3d37c87a128098a1b1a38cb8621be9a4d4e8c15e
2023-11-14 20:00:28 +08:00
Chelsea Hao
92fee9f552 Merge changes Icfeafa14,I775e640b,I8d0d8150 into main
* changes:
  [Audiosharing] Create progressCategory to show stream.
  [Audiosharing] Created audiostreams package.
  [Audiosharing] Branch existing LE QrCode scanner.
2023-11-14 11:14:24 +00:00
chelseahao
eef358eb92 [Audiosharing] Create progressCategory to show stream.
Bug: 308368124
Test: Manual
Change-Id: Icfeafa14ec57782f520e66df74332cdbe3ac5d9f
2023-11-14 10:28:48 +00:00
Yiyi Shen
475f87bedc [Audiosharing] Impl the join audio sharing dialog.
Show the dialog when the first or second eligible remote device connected during the
sharing session;
Or when the second eligible remote device connected and
no sharing session.

Flagged with enable_le_audio_sharing

Bug: 305620450
Test: Manual
Change-Id: If59025d60821b00c169e0d739f4b68c31ce4bbbd
2023-11-14 18:09:45 +08:00
chelseahao
af0d38fbec [Audiosharing] Created audiostreams package.
Also updated some resource names.

Bug: 308368124
Test: Manual
Change-Id: I775e640bb34a02ee104cefd9a396af6a9f2fbb6e
2023-11-14 17:23:37 +08:00
chelseahao
74b9b9dbb4 [Audiosharing] Branch existing LE QrCode scanner.
Bug: 308368124
Test: Manual
Change-Id: I8d0d8150baedfee7d74f60a3c18ecbc93271cada
2023-11-14 16:53:10 +08:00
Yiyi Shen
2a2a748db4 [Audiosharing] Impl the switch audio sharing dialog.
Show the dialog when a third eligible remote device connected during the
sharing session.

Flagged with enable_le_audio_sharing

Bug: 305620450
Test: Manual
Change-Id: Ib6627b68ef3d70305e9136e09a079bb53a459b85
2023-11-14 15:31:45 +08:00
Chelsea Hao
c31f3564a4 Merge "[Audiosharing] Display broadcast QR code." into main 2023-11-13 09:44:27 +00:00
Yiyi Shen
d2c3614829 Merge "[Audiosharing] Impl the stop audio sharing dialog." into main 2023-11-13 09:43:46 +00:00
chelseahao
e8b3081f17 [Audiosharing] Display broadcast QR code.
Bug: 308368124
Test: Manual
Change-Id: I19ec1d15ab26e178b4bb1d9ea1d84dcce0dcc109
2023-11-13 15:54:53 +08:00
Ajinkya Chalke
e9c09d9c83 Merge "Conditionally add tail button pref" into main 2023-11-08 11:09:28 +00:00
Yiyi Shen
28ef49e0ac [Audiosharing] Impl the stop audio sharing dialog.
Show the dialog when an ineligible remote device connected during the
sharing session.

Flagged with enable_le_audio_sharing

Bug: 305620450
Test: Manual
Change-Id: I3b3cc2e5e20dab7c07f9979bc01f53d6127ea20b
2023-11-08 18:08:35 +08:00
Chaohui Wang
32d9280e97 Merge "Revert^2 "Migrate to CompoundButton.OnCheckedChangeListener"" into main 2023-11-08 09:05:22 +00:00
Yiyi Shen
2f2afa22fd [Audiosharing] Add audio sharing section to Connected devices page.
The section will show up during a sharing session.

Flagged with enable_le_audio_sharing

Bug: 305620450
Test: Manual
Change-Id: I59cf81b35dcbf328b253d72d7fdc86af450251ee
2023-11-08 13:41:05 +08:00
Ajinkya Chalke
15c617625a Conditionally add tail button pref
- The connected device settings shouldn't show the tail button pref
  setting if the input device doesn't support it.

Bug: 293472525
Test: atest StylusDevicesControllerTest
Flag: NONE
Change-Id: I50ab43e971b0dd8530a5bdab8544a46e889366ee
2023-11-07 17:39:29 +00:00
Chaohui Wang
08a1c9876e Revert^2 "Migrate to CompoundButton.OnCheckedChangeListener"
8979681a8d

Change-Id: I60edd3aabf49afbe4aa016af780baa68d928bddf
2023-11-07 14:17:15 +00:00
Sebastian Pickl
8979681a8d Revert "Migrate to CompoundButton.OnCheckedChangeListener"
Revert submission 25147565-onSwitchChanged-CompoundButton

Reason for revert: breaking builds 

Bug:309601476

Reverted changes: /q/submissionid:25147565-onSwitchChanged-CompoundButton

Change-Id: Ie746db87d9c642599593aa3d5e5baf6b7ba89c0e
2023-11-07 13:26:36 +00:00
Chaohui Wang
71d1f021af Migrate to CompoundButton.OnCheckedChangeListener
Switch and SwitchCompat are both CompoundButton.

Using CompoundButton in Java will helps migration in the future.

Bug: 306658427
Test: manual - check Settings pages
Change-Id: If2e08a9a9557ec66a3b31ef18cd2e15943098a59
2023-11-07 20:22:27 +08:00
Yiyi Shen
87372de071 [Audiosharing] Impl audio sharing main switch.
Start/stop broadcast when >=1 eligible buds connected.

Flagged with enable_le_audio_sharing

Bug: 305620450
Test: Manual
Change-Id: Ic982571f49ab79c39d0503929df4bb8be64b720e
2023-11-07 15:41:34 +08:00
Yiyi Shen
cded970a4b [Audiosharing] Impl audio sharing main switch.
Start/stop broadcast when no eligible  buds connected.

Flagged with enable_le_audio_sharing

Bug: 305620450
Test: Manual
Change-Id: I04359c0954e336ceb1a89a7836199b5be0b5e0c5
2023-11-03 16:20:35 +08:00
Yiyi Shen
1af86c34af [Audiosharing] Add audio sharing stream name preference.
Flagged with enable_le_audio_sharing

Bug: 305620450
Test: Manual
Change-Id: I1502fb824bcf612d069ee24d7af67afda5e997bb
2023-11-01 13:32:09 +00:00
Yiyi Shen
d624b575a6 Merge "[Audiosharing] Add audio sharing dialog." into main 2023-11-01 03:54:45 +00:00
Yiyi Shen
738962fb28 [Audiosharing] Add audio sharing dialog.
Open the dialog when audio sharing main switch on.

Flagged with enable_le_audio_sharing

Bug: 305620450
Test: Manual
Change-Id: I5b7cf655782a1da8b4fbd42eca11b473bac339b0
2023-10-31 17:04:52 +08:00
chelseahao
9dd627e9e4 [Audiosharing] Add audio sharing streams page and entry point.
Flagged with enable_le_audio_qr_code_private_broadcast_sharing

Bug: 308368124
Test: Manual
Change-Id: Ia5b56c288e61ac9accd33d7674b049e46a9ef03d
2023-10-31 08:12:03 +00:00
Treehugger Robot
ff03ce88ff Merge "settings(nfc): Remove NFC beam settings" into main am: e8df63f148
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2808364

Change-Id: Ic8c0f7ceec443aca5172cd38ede765781640dc0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 21:03:30 +00:00
Roshan Pius
ad565c49dc settings(nfc): Remove NFC beam settings
This API was already deprecated and not supported for a few years. The
API was completely removed in Android U (see b/236980291).

Bug: 307352220
Test: Verified NFC settings works correctly
Merged-In: I40974a26d170cf3eeec18e6a07a21f6c420eca9e
Change-Id: I40974a26d170cf3eeec18e6a07a21f6c420eca9e
2023-10-30 19:42:47 +00:00
Treehugger Robot
336e95cf64 Merge "settings(nfc): Remove NFC beam settings" into main 2023-10-30 17:11:17 +00:00
Yiyi Shen
60c33f570c [Audiosharing] Add calls and alarms device picker when sharing.
Flagged with enable_le_audio_sharing

Bug: 305620450
Test: Manual
Change-Id: I211bbd83e29a1ea865c3e368f0fcacf3a98255e9
2023-10-30 16:05:01 +08:00
Roshan Pius
21c3bca13f settings(nfc): Remove NFC beam settings
This API was already deprecated and not supported for a few years. The
API was completely removed in Android U (see b/236980291).

Bug: 307352220
Test: Verified NFC settings works correctly
Change-Id: I40974a26d170cf3eeec18e6a07a21f6c420eca9e
2023-10-27 13:26:07 -07:00
Chaohui Wang
12ea5afdf1 Not call MainSwitchBar.getSwitch()
This is private implement details, will be removed in future.

Should call MainSwitchBar's isChecked() and setChecked() to ensure
main switch bar's style is set correctly.

Bug: 306658427
Test: manual - on wifi tether
Test: manual - on developer options
Test: m RunSettingsRoboTests
Change-Id: I292ffbcf73da0721fc206e3dac7610a0aeb20047
2023-10-25 13:52:43 +08:00
Yiyi Shen
852ec4e22d Merge "[Audiosharing] Add audio sharing settings with the main switch." into main 2023-10-24 09:50:40 +00:00
Yiyi Shen
4410df7f42 [Audiosharing] Add audio sharing settings with the main switch.
Flagged with enable_le_audio_sharing

Bug: 305620450
Test: Manual
Change-Id: I9ca520014d3f6f7147bb9b8e7648797e79b46f53
2023-10-24 16:12:13 +08:00