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

Merge "MediaRouter: Remove uses of not-yet-public API" into mnc-ub-dev

Browse Source
This commit is contained in:
Jae Seo
2015-08-28 01:04:16 +00:00
committed by Android (Google) Code Review
parent 2b6ef49f07 106e33404a
commit 7ec208209a
4 changed files with 0 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
samples/Support7Demos/res/drawable-hdpi/ic_android.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 358 B

BIN
samples/Support7Demos/res/drawable-mdpi/ic_android.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 226 B

2
samples/Support7Demos/res/values/strings.xml
View File

@@ -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 -->

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_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);
}