Volume changes in MediaRouteChooserDialog

Use the max volume reported by the selected route as the max value to set.

Change-Id: I9848dfb201387843e7ed398ac61e2d13e14e3f51
This commit is contained in:
Adam Powell
2012-06-21 19:59:53 -07:00
parent 9ce1ea3aa7
commit 4dd21c8e77

View File

@@ -70,7 +70,6 @@ public class MediaRouteChooserDialogFragment extends DialogFragment {
};
MediaRouter mRouter;
AudioManager mAudio;
private int mRouteTypes;
private LayoutInflater mInflater;
@@ -98,7 +97,6 @@ public class MediaRouteChooserDialogFragment extends DialogFragment {
public void onAttach(Activity activity) {
super.onAttach(activity);
mRouter = (MediaRouter) activity.getSystemService(Context.MEDIA_ROUTER_SERVICE);
mAudio = (AudioManager) activity.getSystemService(Context.AUDIO_SERVICE);
}
@Override
@@ -150,7 +148,7 @@ public class MediaRouteChooserDialogFragment extends DialogFragment {
final RouteInfo selectedRoute = mRouter.getSelectedRoute(mRouteTypes);
if (selectedRoute.getVolumeHandling() == RouteInfo.PLAYBACK_VOLUME_VARIABLE) {
final int maxVolume = mAudio.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
final int maxVolume = selectedRoute.getVolumeMax();
newValue = Math.max(0, Math.min(newValue, maxVolume));
selectedRoute.requestSetVolume(newValue);
}