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

am b26f52f2: MediaRouter: Add a sample for the custom route icon

Browse Source 
* commit 'b26f52f2c06ee64f4e154f560c93f65982817482':
  MediaRouter: Add a sample for the custom route icon
This commit is contained in:
Jae Seo
2015-08-25 05:46:20 +00:00
committed by Android Git Automerger
parent 586256c891 b26f52f2c0
commit dd7c2dc33e
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 358 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 226 B

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

@@ -133,18 +133,16 @@ final class SampleMediaRouteProvider extends MediaRouteProvider {
f6.addAction(MediaControlIntent.ACTION_GET_SESSION_STATUS); f6.addAction(MediaControlIntent.ACTION_GET_SESSION_STATUS);
f6.addAction(MediaControlIntent.ACTION_END_SESSION); f6.addAction(MediaControlIntent.ACTION_END_SESSION);
CONTROL_FILTERS_BASIC = new ArrayList<IntentFilter>(); CONTROL_FILTERS_BASIC = new ArrayList<>();
CONTROL_FILTERS_BASIC.add(f1); CONTROL_FILTERS_BASIC.add(f1);
CONTROL_FILTERS_BASIC.add(f2); CONTROL_FILTERS_BASIC.add(f2);
CONTROL_FILTERS_BASIC.add(f3); CONTROL_FILTERS_BASIC.add(f3);
CONTROL_FILTERS_QUEUING = CONTROL_FILTERS_QUEUING = new ArrayList<>(CONTROL_FILTERS_BASIC);
new ArrayList<IntentFilter>(CONTROL_FILTERS_BASIC);
CONTROL_FILTERS_QUEUING.add(f4); CONTROL_FILTERS_QUEUING.add(f4);
CONTROL_FILTERS_QUEUING.add(f5); CONTROL_FILTERS_QUEUING.add(f5);
CONTROL_FILTERS_SESSION = CONTROL_FILTERS_SESSION = new ArrayList<>(CONTROL_FILTERS_QUEUING);
new ArrayList<IntentFilter>(CONTROL_FILTERS_QUEUING);
CONTROL_FILTERS_SESSION.add(f6); CONTROL_FILTERS_SESSION.add(f6);
} }
@@ -157,7 +155,6 @@ final class SampleMediaRouteProvider extends MediaRouteProvider {
} }
private int mVolume = 5; private int mVolume = 5;
private int mEnqueueCount;
public SampleMediaRouteProvider(Context context) { public SampleMediaRouteProvider(Context context) {
super(context); super(context);
@@ -243,6 +240,9 @@ final class SampleMediaRouteProvider extends MediaRouteProvider {
.setVolume(mVolume) .setVolume(mVolume)
.build(); .build();
Uri iconUri = Uri.parse("android.resource://com.example.android.supportv7/"
+ R.drawable.ic_android);
MediaRouteDescriptor routeDescriptor6 = new MediaRouteDescriptor.Builder( MediaRouteDescriptor routeDescriptor6 = new MediaRouteDescriptor.Builder(
MIXED_VOLUME_ROUTE_GROUP_ID, MIXED_VOLUME_ROUTE_GROUP_ID,
r.getString(R.string.mixed_volume_route_group_name)) r.getString(R.string.mixed_volume_route_group_name))
@@ -250,6 +250,7 @@ final class SampleMediaRouteProvider extends MediaRouteProvider {
.addChildId(VARIABLE_VOLUME_BASIC_ROUTE_ID) .addChildId(VARIABLE_VOLUME_BASIC_ROUTE_ID)
.addChildId(VARIABLE_VOLUME_QUEUING_ROUTE_ID) .addChildId(VARIABLE_VOLUME_QUEUING_ROUTE_ID)
.setDescription(r.getString(R.string.sample_route_description)) .setDescription(r.getString(R.string.sample_route_description))
.setIconUri(iconUri)
.addControlFilters(CONTROL_FILTERS_SESSION) .addControlFilters(CONTROL_FILTERS_SESSION)
.setPlaybackStream(AudioManager.STREAM_MUSIC) .setPlaybackStream(AudioManager.STREAM_MUSIC)
.setPlaybackType(MediaRouter.RouteInfo.PLAYBACK_TYPE_REMOTE) .setPlaybackType(MediaRouter.RouteInfo.PLAYBACK_TYPE_REMOTE)