From 106e33404a9b0cb0ee387bd54f4adee482f43fc1 Mon Sep 17 00:00:00 2001
From: Jae Seo <jaeseo@google.com>
Date: Thu, 27 Aug 2015 17:51:29 -0700
Subject: [PATCH] MediaRouter: Remove uses of not-yet-public API

Change-Id: I05949c75081fc963fe4b025f6f4db13d0255eeef
---
 .../res/drawable-hdpi/ic_android.png          | Bin 358 -> 0 bytes
 .../res/drawable-mdpi/ic_android.png          | Bin 226 -> 0 bytes
 samples/Support7Demos/res/values/strings.xml  |   2 -
 .../media/SampleMediaRouteProvider.java       |  38 ------------------
 4 files changed, 40 deletions(-)
 delete mode 100755 samples/Support7Demos/res/drawable-hdpi/ic_android.png
 delete mode 100755 samples/Support7Demos/res/drawable-mdpi/ic_android.png

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 94b8fb1fa04ec19ebb35c408c3ee73b814bb8747..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 358
zcmV-s0h#`ZP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0003kNkl<ZcmeIy
zKS~2Z6vy#N6px^tg@h<JHWE*wpoLZ*;S1_QGG|c1BM5??VT&z1LH;yi8bd%xwOT%x
zWr|(i;JzSs$+yU>KF$0R7yEF@J6&9)17;lKbdFei%=us!M~4fNqH}gi=94MgcF3{M
zoEfi3rL1HMa2aTWXC%@i>&rlGUJ&9v(XvBV$S+}qw#bnpkE;O=Uw-Fo+MpYxEXCI#
zPa3Xk8<ZgpWj1Kh2rX<-AKy^l2HA^1M~un2qm4rhIo5dKn+d%-G)Br!%+Oi5Ms-L+
z12Z(J+!4r|A-{rF(7!`}U-o3_-`Z)ohIOdNh@4wmW~j|QUko`65V~n2^Je>F>yqG+
zP>L@~E6<V8F+utr^&71qHBmJ`6Qn1q=4XTSMD_f1KVg`(6#e2><NyEw07*qoM6N<$
Ef_=f46951J

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 afc43dbdd4e389365e758dc0927fe669c88f3584..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 226
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+im7Xq+Ar*{ICmC`v8H%vhtIj)k
zsQE_3jS6YU8P+>CJXp!%=sNpomi`9ui11bpHn~ofOdXvwChKQp+HL%C(danSG?R!9
z!OaVj56`q_R@bshdz#?Y&Ar1&lQmiD4!gM9&xF5WKAYlK*AyI4wRqBOCwb?S<3xiS
zMghq?OpHWq3T-|$^04mmWRt9ys42WQYu+l63g^Zf>R)4j>Q`#U+4Gg~uPs_oopE#z
ZgHE29^7mlPPN1V1JYD@<);T3K0RS#_QELDI

diff --git a/samples/Support7Demos/res/values/strings.xml b/samples/Support7Demos/res/values/strings.xml
index 1f42fe85c..accf739d1 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 37cfa74d9..8aefacf52 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;
 
@@ -225,47 +223,11 @@ final class SampleMediaRouteProvider extends MediaRouteProvider {
                 .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);
     }