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

Merge changes from topic "grouped-volume-tweak" into sc-v2-dev am: f256468516

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

Change-Id: Ifb352d0b8e2cb8d8f309b96b5340d8de689e799c
This commit is contained in:
Oliver Woodman
2021-11-10 11:05:05 +00:00
committed by Automerger Merge Worker
parent e49fa1c0be f256468516
commit e180aad3a4
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java
View File

@@ -71,6 +71,7 @@ public class InfoMediaManager extends MediaManager {
MediaRouter2Manager mRouterManager; MediaRouter2Manager mRouterManager;
@VisibleForTesting @VisibleForTesting
String mPackageName; String mPackageName;
private final boolean mVolumeAdjustmentForRemoteGroupSessions;
private MediaDevice mCurrentConnectedDevice; private MediaDevice mCurrentConnectedDevice;
private LocalBluetoothManager mBluetoothManager; private LocalBluetoothManager mBluetoothManager;
@@ -84,6 +85,9 @@ public class InfoMediaManager extends MediaManager {
if (!TextUtils.isEmpty(packageName)) { if (!TextUtils.isEmpty(packageName)) {
mPackageName = packageName; mPackageName = packageName;
} }
mVolumeAdjustmentForRemoteGroupSessions = context.getResources().getBoolean(
com.android.internal.R.bool.config_volumeAdjustmentForRemoteGroupSessions);
} }
@Override @Override
@@ -388,7 +392,9 @@ public class InfoMediaManager extends MediaManager {
@TargetApi(Build.VERSION_CODES.R) @TargetApi(Build.VERSION_CODES.R)
boolean shouldEnableVolumeSeekBar(RoutingSessionInfo sessionInfo) { boolean shouldEnableVolumeSeekBar(RoutingSessionInfo sessionInfo) {
return false; return sessionInfo.isSystemSession() // System sessions are not remote
|| mVolumeAdjustmentForRemoteGroupSessions
|| sessionInfo.getSelectedRoutes().size() <= 1;
} }
private void refreshDevices() { private void refreshDevices() {