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 am: e180aad3a4

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

Change-Id: I3451bb899abc4ab19ee8fa3829c969fcc6771ce5
This commit is contained in:
Oliver Woodman
2021-11-10 11:29:29 +00:00
committed by Automerger Merge Worker
parent ca93164397 e180aad3a4
commit 955df669c4
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;
@VisibleForTesting
String mPackageName;
private final boolean mVolumeAdjustmentForRemoteGroupSessions;
private MediaDevice mCurrentConnectedDevice;
private LocalBluetoothManager mBluetoothManager;
@@ -84,6 +85,9 @@ public class InfoMediaManager extends MediaManager {
if (!TextUtils.isEmpty(packageName)) {
mPackageName = packageName;
}
mVolumeAdjustmentForRemoteGroupSessions = context.getResources().getBoolean(
com.android.internal.R.bool.config_volumeAdjustmentForRemoteGroupSessions);
}
@Override
@@ -386,7 +390,9 @@ public class InfoMediaManager extends MediaManager {
@TargetApi(Build.VERSION_CODES.R)
boolean shouldEnableVolumeSeekBar(RoutingSessionInfo sessionInfo) {
return false;
return sessionInfo.isSystemSession() // System sessions are not remote
|| mVolumeAdjustmentForRemoteGroupSessions
|| sessionInfo.getSelectedRoutes().size() <= 1;
}
private void refreshDevices() {