Not support group volume control
-Disable in Sound Settings
-Remove from Volume Panel
Bug: 189270378
Test: make -j50 RunSettingsRoboTests
Change-Id: Ie4f8be8d694b3c69dd2596a1f88fcb68789eab45
diff --git a/src/com/android/settings/media/MediaDeviceUpdateWorker.java b/src/com/android/settings/media/MediaDeviceUpdateWorker.java
index 14e8267..dd27073 100644
--- a/src/com/android/settings/media/MediaDeviceUpdateWorker.java
+++ b/src/com/android/settings/media/MediaDeviceUpdateWorker.java
@@ -259,6 +259,10 @@
return mLocalMediaManager.shouldDisableMediaOutput(packageName);
}
+ boolean shouldEnableVolumeSeekBar(RoutingSessionInfo sessionInfo) {
+ return mLocalMediaManager.shouldEnableVolumeSeekBar(sessionInfo);
+ }
+
private class DevicesChangedBroadcastReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
diff --git a/src/com/android/settings/media/RemoteMediaSlice.java b/src/com/android/settings/media/RemoteMediaSlice.java
index e69c005..3d81c44 100644
--- a/src/com/android/settings/media/RemoteMediaSlice.java
+++ b/src/com/android/settings/media/RemoteMediaSlice.java
@@ -126,6 +126,12 @@
+ maxVolume);
continue;
}
+ if (!getWorker().shouldEnableVolumeSeekBar(info)) {
+ // There is no disable state. We hide it directly.
+ Log.d(TAG, "Unable to add Slice. " + info.getName() + ": This is a group session");
+ continue;
+ }
+
final CharSequence appName = Utils.getApplicationLabel(
mContext, info.getClientPackageName());
final CharSequence outputTitle = mContext.getString(R.string.media_output_label_title,
diff --git a/src/com/android/settings/notification/RemoteVolumeGroupController.java b/src/com/android/settings/notification/RemoteVolumeGroupController.java
index dd6f516..3d8d261 100644
--- a/src/com/android/settings/notification/RemoteVolumeGroupController.java
+++ b/src/com/android/settings/notification/RemoteVolumeGroupController.java
@@ -129,6 +129,7 @@
seekBarPreference.setMin(0);
seekBarPreference.setOnPreferenceChangeListener(this);
seekBarPreference.setIcon(R.drawable.ic_volume_remote);
+ seekBarPreference.setEnabled(mLocalMediaManager.shouldEnableVolumeSeekBar(info));
mPreferenceCategory.addPreference(seekBarPreference);
}