diff options
Diffstat (limited to 'samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouteProvider.java')
-rw-r--r-- | samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouteProvider.java | 34 |
1 files changed, 14 insertions, 20 deletions
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 15cf19b7d..4208f5894 100644 --- a/samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouteProvider.java +++ b/samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouteProvider.java @@ -16,31 +16,26 @@ package com.example.android.supportv7.media; -import com.example.android.supportv7.R; - +import android.app.PendingIntent; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.IntentFilter.MalformedMimeTypeException; import android.content.IntentSender; import android.content.res.Resources; -import android.graphics.Bitmap; import android.media.AudioManager; import android.media.MediaRouter; import android.net.Uri; import android.os.Bundle; -import android.app.PendingIntent; import android.support.v7.media.MediaControlIntent; -import android.support.v7.media.MediaItemStatus; +import android.support.v7.media.MediaRouteDescriptor; import android.support.v7.media.MediaRouteProvider; -import android.support.v7.media.MediaRouter.ControlRequestCallback; import android.support.v7.media.MediaRouteProviderDescriptor; -import android.support.v7.media.MediaRouteDescriptor; +import android.support.v7.media.MediaRouter.ControlRequestCallback; import android.support.v7.media.MediaSessionStatus; import android.util.Log; -import android.view.Gravity; -import android.view.Surface; -import android.view.SurfaceHolder; + +import com.example.android.supportv7.R; import java.util.ArrayList; @@ -56,6 +51,7 @@ 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 int VOLUME_MAX = 10; /** @@ -135,18 +131,16 @@ final class SampleMediaRouteProvider extends MediaRouteProvider { f6.addAction(MediaControlIntent.ACTION_GET_SESSION_STATUS); 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(f2); CONTROL_FILTERS_BASIC.add(f3); - CONTROL_FILTERS_QUEUING = - new ArrayList<IntentFilter>(CONTROL_FILTERS_BASIC); + CONTROL_FILTERS_QUEUING = new ArrayList<>(CONTROL_FILTERS_BASIC); CONTROL_FILTERS_QUEUING.add(f4); CONTROL_FILTERS_QUEUING.add(f5); - CONTROL_FILTERS_SESSION = - new ArrayList<IntentFilter>(CONTROL_FILTERS_QUEUING); + CONTROL_FILTERS_SESSION = new ArrayList<>(CONTROL_FILTERS_QUEUING); CONTROL_FILTERS_SESSION.add(f6); } @@ -159,7 +153,6 @@ final class SampleMediaRouteProvider extends MediaRouteProvider { } private int mVolume = 5; - private int mEnqueueCount; public SampleMediaRouteProvider(Context context) { super(context); @@ -218,6 +211,8 @@ final class SampleMediaRouteProvider extends MediaRouteProvider { .setCanDisconnect(true) .build(); + Uri iconUri = Uri.parse("android.resource://com.example.android.supportv7/" + + R.drawable.ic_android); MediaRouteDescriptor routeDescriptor4 = new MediaRouteDescriptor.Builder( VARIABLE_VOLUME_SESSION_ROUTE_ID, r.getString(R.string.variable_volume_session_route_name)) @@ -228,10 +223,10 @@ final class SampleMediaRouteProvider extends MediaRouteProvider { .setVolumeHandling(MediaRouter.RouteInfo.PLAYBACK_VOLUME_VARIABLE) .setVolumeMax(VOLUME_MAX) .setVolume(mVolume) + .setIconUri(iconUri) .build(); - MediaRouteProviderDescriptor providerDescriptor = - new MediaRouteProviderDescriptor.Builder() + MediaRouteProviderDescriptor providerDescriptor = new MediaRouteProviderDescriptor.Builder() .addRoute(routeDescriptor1) .addRoute(routeDescriptor2) .addRoute(routeDescriptor3) @@ -412,7 +407,6 @@ final class SampleMediaRouteProvider extends MediaRouteProvider { callback.onError("Failed to open " + uri.toString(), null); } } - mEnqueueCount +=1; return true; } @@ -620,4 +614,4 @@ final class SampleMediaRouteProvider extends MediaRouteProvider { } } } -}
\ No newline at end of file +} |