Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dba11591 authored by Oliver Woodman's avatar Oliver Woodman Committed by Automerger Merge Worker
Browse files

Re-enable volume control for non-grouped devices am: b7f52f44 am: 5f9c2120 

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

Change-Id: I6790f94cf33ca431a2724023ca4c87b44be5cabb
parents ee9ff193 5f9c2120

packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java

+7 −1
Original line number Diff line number Diff line
@@ -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
@@ -388,7 +392,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() {