Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Plumb config to output switcher indication chip" into sc-v2-dev am: ca5da05e30

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16233500

Change-Id: I0b38836eaa50dc988bc0911245a3388ac654aeae
This commit is contained in:
Oliver Woodman
2021-11-11 15:19:32 +00:00
committed by Automerger Merge Worker
parent 0926394011 ca5da05e30
commit 11c8b02aa4
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java
View File

@@ -79,6 +79,7 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback {
private final DialogLaunchAnimator mDialogLaunchAnimator; private final DialogLaunchAnimator mDialogLaunchAnimator;
private final List<MediaDevice> mGroupMediaDevices = new CopyOnWriteArrayList<>(); private final List<MediaDevice> mGroupMediaDevices = new CopyOnWriteArrayList<>();
private final boolean mAboveStatusbar; private final boolean mAboveStatusbar;
private final boolean mVolumeAdjustmentForRemoteGroupSessions;
private final NotificationEntryManager mNotificationEntryManager; private final NotificationEntryManager mNotificationEntryManager;
@VisibleForTesting @VisibleForTesting
final List<MediaDevice> mMediaDevices = new CopyOnWriteArrayList<>(); final List<MediaDevice> mMediaDevices = new CopyOnWriteArrayList<>();
@@ -111,6 +112,8 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback {
mMetricLogger = new MediaOutputMetricLogger(mContext, mPackageName); mMetricLogger = new MediaOutputMetricLogger(mContext, mPackageName);
mUiEventLogger = uiEventLogger; mUiEventLogger = uiEventLogger;
mDialogLaunchAnimator = dialogLaunchAnimator; mDialogLaunchAnimator = dialogLaunchAnimator;
mVolumeAdjustmentForRemoteGroupSessions = mContext.getResources().getBoolean(
com.android.internal.R.bool.config_volumeAdjustmentForRemoteGroupSessions);
} }
void start(@NonNull Callback cb) { void start(@NonNull Callback cb) {
@@ -477,7 +480,9 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback {
} }
boolean isVolumeControlEnabled(@NonNull MediaDevice device) { boolean isVolumeControlEnabled(@NonNull MediaDevice device) {
return !isActiveRemoteDevice(device); // TODO(b/202500642): Also enable volume control for remote non-group sessions.
return !isActiveRemoteDevice(device)
|| mVolumeAdjustmentForRemoteGroupSessions;
} }
private final MediaController.Callback mCb = new MediaController.Callback() { private final MediaController.Callback mCb = new MediaController.Callback() {