diff options
| author | Sungsoo Lim <sungsoo@google.com> | 2015-10-12 10:00:30 +0900 |
|---|---|---|
| committer | Sungsoo Lim <sungsoo@google.com> | 2015-10-13 13:28:04 +0900 |
| commit | 6327806028e08627f23f9b8c288469fef31a3607 (patch) | |
| tree | 49ab131d09f5250ca2d24a3c321bbd1ce372f3c8 | |
| parent | b6239eab03ac4d5329b3fc666e9031ff47852e8a (diff) | |
| download | android_development-6327806028e08627f23f9b8c288469fef31a3607.tar.gz android_development-6327806028e08627f23f9b8c288469fef31a3607.tar.bz2 android_development-6327806028e08627f23f9b8c288469fef31a3607.zip | |
Remove route providers which use RouteGroup
Bug: 24831500
Change-Id: I272a2a944685384166308aa745e67d743e0b7637
| -rw-r--r-- | samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouteProvider.java | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouteProvider.java b/samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouteProvider.java index 9c909103c..4208f5894 100644 --- a/samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouteProvider.java +++ b/samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouteProvider.java @@ -51,8 +51,6 @@ final class SampleMediaRouteProvider extends MediaRouteProvider { private static final String VARIABLE_VOLUME_BASIC_ROUTE_ID = "variable_basic"; private static final String VARIABLE_VOLUME_QUEUING_ROUTE_ID = "variable_queuing"; private static final String VARIABLE_VOLUME_SESSION_ROUTE_ID = "variable_session"; - private static final String VARIABLE_VOLUME_ROUTE_GROUP_ID = "variable_group"; - private static final String MIXED_VOLUME_ROUTE_GROUP_ID = "mixed_group"; private static final int VOLUME_MAX = 10; @@ -213,6 +211,8 @@ final class SampleMediaRouteProvider extends MediaRouteProvider { .setCanDisconnect(true) .build(); + Uri iconUri = Uri.parse("android.resource://com.example.android.supportv7/" + + R.drawable.ic_android); MediaRouteDescriptor routeDescriptor4 = new MediaRouteDescriptor.Builder( VARIABLE_VOLUME_SESSION_ROUTE_ID, r.getString(R.string.variable_volume_session_route_name)) @@ -223,39 +223,7 @@ final class SampleMediaRouteProvider extends MediaRouteProvider { .setVolumeHandling(MediaRouter.RouteInfo.PLAYBACK_VOLUME_VARIABLE) .setVolumeMax(VOLUME_MAX) .setVolume(mVolume) - .build(); - - MediaRouteDescriptor routeDescriptor5 = new MediaRouteDescriptor.Builder( - VARIABLE_VOLUME_ROUTE_GROUP_ID, - r.getString(R.string.variable_volume_route_group_name)) - .addGroupMemberId(VARIABLE_VOLUME_BASIC_ROUTE_ID) - .addGroupMemberId(VARIABLE_VOLUME_QUEUING_ROUTE_ID) - .setDescription(r.getString(R.string.sample_route_description)) - .addControlFilters(CONTROL_FILTERS_SESSION) - .setPlaybackStream(AudioManager.STREAM_MUSIC) - .setPlaybackType(MediaRouter.RouteInfo.PLAYBACK_TYPE_REMOTE) - .setVolumeHandling(MediaRouter.RouteInfo.PLAYBACK_VOLUME_VARIABLE) - .setVolumeMax(VOLUME_MAX) - .setVolume(mVolume) - .build(); - - Uri iconUri = Uri.parse("android.resource://com.example.android.supportv7/" - + R.drawable.ic_android); - MediaRouteDescriptor routeDescriptor6 = new MediaRouteDescriptor.Builder( - MIXED_VOLUME_ROUTE_GROUP_ID, - r.getString(R.string.mixed_volume_route_group_name)) - .addGroupMemberId(FIXED_VOLUME_ROUTE_ID) - .addGroupMemberId(VARIABLE_VOLUME_BASIC_ROUTE_ID) - .addGroupMemberId(VARIABLE_VOLUME_QUEUING_ROUTE_ID) - .addGroupMemberId(VARIABLE_VOLUME_SESSION_ROUTE_ID) - .setDescription(r.getString(R.string.sample_route_description)) .setIconUri(iconUri) - .addControlFilters(CONTROL_FILTERS_SESSION) - .setPlaybackStream(AudioManager.STREAM_MUSIC) - .setPlaybackType(MediaRouter.RouteInfo.PLAYBACK_TYPE_REMOTE) - .setVolumeHandling(MediaRouter.RouteInfo.PLAYBACK_VOLUME_VARIABLE) - .setVolumeMax(VOLUME_MAX) - .setVolume(mVolume) .build(); MediaRouteProviderDescriptor providerDescriptor = new MediaRouteProviderDescriptor.Builder() @@ -263,8 +231,6 @@ final class SampleMediaRouteProvider extends MediaRouteProvider { .addRoute(routeDescriptor2) .addRoute(routeDescriptor3) .addRoute(routeDescriptor4) - .addRoute(routeDescriptor5) - .addRoute(routeDescriptor6) .build(); setDescriptor(providerDescriptor); } |