Commit 9c323d97 authored 10 months ago by Iván Budnik Committed by Android (Google) Code Review 10 months ago

Merge "Use PlaybackInfo to provide routing information for media apps" into main

parents 4c1803f8 8874c5c6

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

packages/SettingsLib/aconfig/settingslib_media_flag_declarations.aconfig 11 additions, 0 deletions

...gsLib/aconfig/settingslib_media_flag_declarations.aconfig
packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java 77 additions, 6 deletions

...b/src/com/android/settingslib/media/InfoMediaManager.java
packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java 5 additions, 1 deletion

.../src/com/android/settingslib/media/LocalMediaManager.java
packages/SettingsLib/src/com/android/settingslib/media/ManagerInfoMediaManager.java 4 additions, 2 deletions

...om/android/settingslib/media/ManagerInfoMediaManager.java
packages/SettingsLib/src/com/android/settingslib/media/NoOpInfoMediaManager.java 4 additions, 2 deletions

...c/com/android/settingslib/media/NoOpInfoMediaManager.java
packages/SettingsLib/src/com/android/settingslib/media/RouterInfoMediaManager.java 4 additions, 2 deletions

...com/android/settingslib/media/RouterInfoMediaManager.java
packages/SettingsLib/tests/integ/src/com/android/settingslib/media/InfoMediaManagerIntegTest.java 5 additions, 4 deletions

.../android/settingslib/media/InfoMediaManagerIntegTest.java
packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaManagerTest.java 5 additions, 1 deletion

...c/com/android/settingslib/media/InfoMediaManagerTest.java
packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/LocalMediaManagerTest.java 10 additions, 3 deletions

.../com/android/settingslib/media/LocalMediaManagerTest.java
packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/NoOpInfoMediaManagerTest.java 2 additions, 1 deletion

...m/android/settingslib/media/NoOpInfoMediaManagerTest.java
packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/domain/interactor/MediaControlInteractorTest.kt 1 addition, 0 deletions

.../controls/domain/interactor/MediaControlInteractorTest.kt
packages/SystemUI/src/com/android/systemui/bluetooth/BroadcastDialogDelegate.java 2 additions, 1 deletion

...m/android/systemui/bluetooth/BroadcastDialogDelegate.java
packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDeviceManager.kt 2 additions, 1 deletion

...emui/media/controls/domain/pipeline/MediaDeviceManager.kt
packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/interactor/MediaControlInteractor.kt 7 additions, 2 deletions

...rols/domain/pipeline/interactor/MediaControlInteractor.kt
packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaControlPanel.java 4 additions, 2 deletions

...temui/media/controls/ui/controller/MediaControlPanel.java
packages/SystemUI/src/com/android/systemui/media/controls/ui/viewmodel/MediaControlViewModel.kt 10 additions, 2 deletions

...emui/media/controls/ui/viewmodel/MediaControlViewModel.kt
packages/SystemUI/src/com/android/systemui/media/controls/util/LocalMediaManagerFactory.kt 9 additions, 2 deletions

.../systemui/media/controls/util/LocalMediaManagerFactory.kt
packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBroadcastDialogManager.kt 6 additions, 1 deletion

...ystemui/media/dialog/MediaOutputBroadcastDialogManager.kt
packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java 27 additions, 16 deletions

.../android/systemui/media/dialog/MediaOutputController.java
packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialogManager.kt 8 additions, 2 deletions

...android/systemui/media/dialog/MediaOutputDialogManager.kt

with 203 additions and 51 deletions

Please register or to comment