MediaRouter: Disable volume slider for fixed volume devices
Bug: 23117862
Change-Id: I4e18777cb5051391cde005a04030075fbcf7a686
diff --git a/v7/mediarouter/src/android/support/v7/app/MediaRouteControllerDialog.java b/v7/mediarouter/src/android/support/v7/app/MediaRouteControllerDialog.java
index 6f69388..88a28bf2 100644
--- a/v7/mediarouter/src/android/support/v7/app/MediaRouteControllerDialog.java
+++ b/v7/mediarouter/src/android/support/v7/app/MediaRouteControllerDialog.java
@@ -564,6 +564,7 @@
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
if (fromUser) {
int position = (int) seekBar.getTag();
+ // TODO: Verify
getGroup().getRouteAt(position).requestSetVolume(progress);
}
}
@@ -596,8 +597,16 @@
textView.setText(route.getName());
SeekBar volumeSlider = (SeekBar) v.findViewById(R.id.media_route_volume_slider);
+ if (route.getVolumeHandling() == MediaRouter.RouteInfo.PLAYBACK_VOLUME_VARIABLE) {
+ volumeSlider.setMax(route.getVolumeMax());
+ volumeSlider.setProgress(route.getVolume());
+ volumeSlider.setOnSeekBarChangeListener(mOnSeekBarChangeListener);
+ } else {
+ volumeSlider.setMax(100);
+ volumeSlider.setProgress(100);
+ volumeSlider.setEnabled(false);
+ }
volumeSlider.setTag(position);
- volumeSlider.setOnSeekBarChangeListener(mOnSeekBarChangeListener);
}
return v;
}
diff --git a/v7/mediarouter/src/android/support/v7/media/MediaRouter.java b/v7/mediarouter/src/android/support/v7/media/MediaRouter.java
index 5f1b1ec..614dade 100644
--- a/v7/mediarouter/src/android/support/v7/media/MediaRouter.java
+++ b/v7/mediarouter/src/android/support/v7/media/MediaRouter.java
@@ -2248,7 +2248,7 @@
return uniqueId;
}
Log.w(TAG, "Either " + routeDescriptorId + " isn't unique in " + componentName
- + " or you're trying to assign a unique ID for an already added route");
+ + " or we're trying to assign a unique ID for an already added route");
for (int i = 2; ; i++) {
String newUniqueId = String.format(Locale.US, "%s_%d", uniqueId, i);
if (findRouteByUniqueId(newUniqueId) < 0) {
