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

Commit f68e7fb4 authored by Oliver Woodman's avatar Oliver Woodman
Browse files

Re-enable volume control for non-grouped devices 

Bug: 197586676
Bug: 202500642
Test: make -j50 RunSettingsRoboTests
Change-Id: I7740d78f3a7dca62d64e6cf7b8c9ffa1578c8e74
parent aa9dc925

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

+7 −1
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ public class InfoMediaManager extends MediaManager { 
    MediaRouter2Manager mRouterManager;

    @VisibleForTesting

    String mPackageName;

    private final boolean mVolumeAdjustmentForRemoteGroupSessions;



    private MediaDevice mCurrentConnectedDevice;

    private LocalBluetoothManager mBluetoothManager;
@@ -83,6 +84,9 @@ public class InfoMediaManager extends MediaManager { 
        if (!TextUtils.isEmpty(packageName)) {

            mPackageName = packageName;

        }



        mVolumeAdjustmentForRemoteGroupSessions = context.getResources().getBoolean(

                com.android.internal.R.bool.config_volumeAdjustmentForRemoteGroupSessions);

    }



    @Override
@@ -387,7 +391,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() {