MediaRouter: Remove uses of not-yet-public API

Change-Id: I05949c75081fc963fe4b025f6f4db13d0255eeef
diff --git a/samples/Support7Demos/res/drawable-hdpi/ic_android.png b/samples/Support7Demos/res/drawable-hdpi/ic_android.png
deleted file mode 100755
index 94b8fb1..0000000
--- a/samples/Support7Demos/res/drawable-hdpi/ic_android.png
+++ /dev/null
Binary files differ
diff --git a/samples/Support7Demos/res/drawable-mdpi/ic_android.png b/samples/Support7Demos/res/drawable-mdpi/ic_android.png
deleted file mode 100755
index afc43db..0000000
--- a/samples/Support7Demos/res/drawable-mdpi/ic_android.png
+++ /dev/null
Binary files differ
diff --git a/samples/Support7Demos/res/values/strings.xml b/samples/Support7Demos/res/values/strings.xml
index 1f42fe8..accf739 100644
--- a/samples/Support7Demos/res/values/strings.xml
+++ b/samples/Support7Demos/res/values/strings.xml
@@ -36,8 +36,6 @@
     <string name="variable_volume_basic_route_name">Variable Volume (Basic) Remote Playback Route</string>
     <string name="variable_volume_queuing_route_name">Variable Volume (Queuing) Remote Playback Route</string>
     <string name="variable_volume_session_route_name">Variable Volume (Session) Remote Playback Route</string>
-    <string name="variable_volume_route_group_name">Variable Volume Route Group</string>
-    <string name="mixed_volume_route_group_name">Mixed Volume Route Group</string>
     <string name="sample_route_description">Sample route from Support7Demos</string>
 
     <!-- GridLayout -->
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 37cfa74..8aefacf 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 @@
     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;
 
@@ -225,47 +223,11 @@
                 .setVolume(mVolume)
                 .build();
 
-        MediaRouteDescriptor routeDescriptor5 = new MediaRouteDescriptor.Builder(
-                VARIABLE_VOLUME_ROUTE_GROUP_ID,
-                r.getString(R.string.variable_volume_route_group_name))
-                .addChildId(VARIABLE_VOLUME_BASIC_ROUTE_ID)
-                .addChildId(VARIABLE_VOLUME_QUEUING_ROUTE_ID)
-                .addChildId(VARIABLE_VOLUME_SESSION_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))
-                .addChildId(FIXED_VOLUME_ROUTE_ID)
-                .addChildId(VARIABLE_VOLUME_BASIC_ROUTE_ID)
-                .addChildId(VARIABLE_VOLUME_QUEUING_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()
                 .addRoute(routeDescriptor1)
                 .addRoute(routeDescriptor2)
                 .addRoute(routeDescriptor3)
                 .addRoute(routeDescriptor4)
-                .addRoute(routeDescriptor5)
-                .addRoute(routeDescriptor6)
                 .build();
         setDescriptor(providerDescriptor);
     }