LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove route providers which use RouteGroup

Browse Source 
Bug: 24831500
Change-Id: I272a2a944685384166308aa745e67d743e0b7637
This commit is contained in:
Sungsoo Lim
2015-10-12 10:00:30 +09:00
parent b6239eab03
commit 6327806028
1 changed files with 2 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouteProvider.java
View File

@@ -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_BASIC_ROUTE_ID = "variable_basic";
private static final String VARIABLE_VOLUME_QUEUING_ROUTE_ID = "variable_queuing"; 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_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; private static final int VOLUME_MAX = 10;
@@ -213,6 +211,8 @@ final class SampleMediaRouteProvider extends MediaRouteProvider {
.setCanDisconnect(true) .setCanDisconnect(true)
.build(); .build();
Uri iconUri = Uri.parse("android.resource://com.example.android.supportv7/"
+ R.drawable.ic_android);
MediaRouteDescriptor routeDescriptor4 = new MediaRouteDescriptor.Builder( MediaRouteDescriptor routeDescriptor4 = new MediaRouteDescriptor.Builder(
VARIABLE_VOLUME_SESSION_ROUTE_ID, VARIABLE_VOLUME_SESSION_ROUTE_ID,
r.getString(R.string.variable_volume_session_route_name)) r.getString(R.string.variable_volume_session_route_name))
@@ -223,39 +223,7 @@ final class SampleMediaRouteProvider extends MediaRouteProvider {
.setVolumeHandling(MediaRouter.RouteInfo.PLAYBACK_VOLUME_VARIABLE) .setVolumeHandling(MediaRouter.RouteInfo.PLAYBACK_VOLUME_VARIABLE)
.setVolumeMax(VOLUME_MAX) .setVolumeMax(VOLUME_MAX)
.setVolume(mVolume) .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) .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(); .build();
MediaRouteProviderDescriptor providerDescriptor = new MediaRouteProviderDescriptor.Builder() MediaRouteProviderDescriptor providerDescriptor = new MediaRouteProviderDescriptor.Builder()
@@ -263,8 +231,6 @@ final class SampleMediaRouteProvider extends MediaRouteProvider {
.addRoute(routeDescriptor2) .addRoute(routeDescriptor2)
.addRoute(routeDescriptor3) .addRoute(routeDescriptor3)
.addRoute(routeDescriptor4) .addRoute(routeDescriptor4)
.addRoute(routeDescriptor5)
.addRoute(routeDescriptor6)
.build(); .build();
setDescriptor(providerDescriptor); setDescriptor(providerDescriptor);
} }