Volume control in MediaRouter dialogs

MediaRouter dialogs now intercept the volume keys for altering the
current volume. The status icon indicates if the slider/buttons are
currently controlling the local device volume or a remote device's
volume.

Group volume for user routes is handled by using the
RemoteControlClient supplied by the first route in the group.

Change-Id: I40a0d054847ed5acce7a4c3b669487841b4dca15

1 files changed, 17 insertions, 0 deletions

diff --git a/media/java/android/media/MediaRouter.java b/media/java/android/media/MediaRouter.java
index 60f3698..715e752 100644
--- a/media/java/android/media/MediaRouter.java
+++ b/media/java/android/media/MediaRouter.java
@@ -198,6 +198,13 @@ public class MediaRouter {
     }
 
     /**
+     * @hide for use by framework routing UI
+     */
+    public RouteCategory getSystemAudioCategory() {
+        return sStatic.mSystemCategory;
+    }
+
+    /**
      * Return the currently selected route for the given types
      *
      * @param type route types
@@ -740,6 +747,16 @@ public class MediaRouter {
         }
 
         /**
+         * Retrieve the RemoteControlClient associated with this route, if one has been set.
+         *
+         * @return the RemoteControlClient associated with this route
+         * @see #setRemoteControlClient(RemoteControlClient)
+         */
+        public RemoteControlClient getRemoteControlClient() {
+            return mRcc;
+        }
+
+        /**
          * Set an icon that will be used to represent this route.
          * The system may use this icon in picker UIs or similar.
          *