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

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

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

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

Change-Id: I3451bb899abc4ab19ee8fa3829c969fcc6771ce5
parents ca931643 e180aad3

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
@@ -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() {