MediaRouter: Rename group API
Use the term "group member" explicitly instead of "child" to denote
group membership
Change-Id: I04c0f09327289c17c23c8ab6bc5d9d16b22bc60e
diff --git a/v7/mediarouter/src/android/support/v7/media/MediaRouteDescriptor.java b/v7/mediarouter/src/android/support/v7/media/MediaRouteDescriptor.java
index 88a684c..2881b32 100644
--- a/v7/mediarouter/src/android/support/v7/media/MediaRouteDescriptor.java
+++ b/v7/mediarouter/src/android/support/v7/media/MediaRouteDescriptor.java
@@ -38,7 +38,7 @@
*/
public final class MediaRouteDescriptor {
private static final String KEY_ID = "id";
- private static final String KEY_CHILD_IDS = "childIds";
+ private static final String KEY_GROUP_MEMBER_IDS = "groupMemberIds";
private static final String KEY_NAME = "name";
private static final String KEY_DESCRIPTION = "status";
private static final String KEY_ICON_URI = "iconUri";
@@ -77,16 +77,16 @@
}
/**
- * Gets the child ids of the route.
+ * Gets the group member ids of the route.
* <p>
- * A route descriptor that has one or more child route ids represents a
- * route group. A child route may belong to another group.
+ * A route descriptor that has one or more group member route ids
+ * represents a route group. A member route may belong to another group.
* </p>
* @hide
* STOPSHIP: Unhide or remove.
*/
- public List<String> getChildIds() {
- return mBundle.getStringArrayList(KEY_CHILD_IDS);
+ public List<String> getGroupMemberIds() {
+ return mBundle.getStringArrayList(KEY_GROUP_MEMBER_IDS);
}
/**
@@ -264,7 +264,7 @@
StringBuilder result = new StringBuilder();
result.append("MediaRouteDescriptor{ ");
result.append("id=").append(getId());
- result.append(", childIds=").append(getChildIds());
+ result.append(", groupMemberIds=").append(getGroupMemberIds());
result.append(", name=").append(getName());
result.append(", description=").append(getDescription());
result.append(", iconUri=").append(getIconUri());
@@ -308,7 +308,7 @@
*/
public static final class Builder {
private final Bundle mBundle;
- private ArrayList<String> mChildIds;
+ private ArrayList<String> mGroupMemberIds;
private ArrayList<IntentFilter> mControlFilters;
/**
@@ -354,45 +354,45 @@
}
/**
- * Adds a child id of the route.
+ * Adds a group member id of the route.
* <p>
- * A route descriptor that has one or more child route ids represents a
- * route group. A child route may belong to another group.
+ * A route descriptor that has one or more group member route ids
+ * represents a route group. A member route may belong to another group.
* </p>
* @hide
* STOPSHIP: Unhide or remove.
*/
- public Builder addChildId(String childId) {
- if (TextUtils.isEmpty(childId)) {
- throw new IllegalArgumentException("childId must not be empty");
+ public Builder addGroupMemberId(String groupMemberId) {
+ if (TextUtils.isEmpty(groupMemberId)) {
+ throw new IllegalArgumentException("groupMemberId must not be empty");
}
- if (mChildIds == null) {
- mChildIds = new ArrayList<>();
+ if (mGroupMemberIds == null) {
+ mGroupMemberIds = new ArrayList<>();
}
- if (!mChildIds.contains(childId)) {
- mChildIds.add(childId);
+ if (!mGroupMemberIds.contains(groupMemberId)) {
+ mGroupMemberIds.add(groupMemberId);
}
return this;
}
/**
- * Adds a list of child ids of the route.
+ * Adds a list of group member ids of the route.
* <p>
- * A route descriptor that has one or more child route ids represents a
- * route group. A child route may belong to another group.
+ * A route descriptor that has one or more group member route ids
+ * represents a route group. A member route may belong to another group.
* </p>
* @hide
* STOPSHIP: Unhide or remove.
*/
- public Builder addChildIds(Collection<String> childIds) {
- if (childIds == null) {
- throw new IllegalArgumentException("childIds must not be null");
+ public Builder addGroupMemberIds(Collection<String> groupMemberIds) {
+ if (groupMemberIds == null) {
+ throw new IllegalArgumentException("groupMemberIds must not be null");
}
- if (!childIds.isEmpty()) {
- for (String childId : childIds) {
- addChildId(childId);
+ if (!groupMemberIds.isEmpty()) {
+ for (String groupMemberId : groupMemberIds) {
+ addGroupMemberId(groupMemberId);
}
}
return this;
@@ -594,8 +594,8 @@
if (mControlFilters != null) {
mBundle.putParcelableArrayList(KEY_CONTROL_FILTERS, mControlFilters);
}
- if (mChildIds != null) {
- mBundle.putStringArrayList(KEY_CHILD_IDS, mChildIds);
+ if (mGroupMemberIds != null) {
+ mBundle.putStringArrayList(KEY_GROUP_MEMBER_IDS, mGroupMemberIds);
}
return new MediaRouteDescriptor(mBundle, mControlFilters);
}
diff --git a/v7/mediarouter/src/android/support/v7/media/MediaRouter.java b/v7/mediarouter/src/android/support/v7/media/MediaRouter.java
index e1ebd94..1b2e9cc 100644
--- a/v7/mediarouter/src/android/support/v7/media/MediaRouter.java
+++ b/v7/mediarouter/src/android/support/v7/media/MediaRouter.java
@@ -1487,15 +1487,15 @@
if (mDescriptor != descriptor) {
mDescriptor = descriptor;
if (descriptor != null) {
- List<String> childIds = descriptor.getChildIds();
+ List<String> groupMemberIds = descriptor.getGroupMemberIds();
List<RouteInfo> routes = new ArrayList<>();
- changed = childIds.size() != mRoutes.size();
- for (String childId : childIds) {
- String uniqueChildId = sGlobal.getUniqueId(getProvider(), childId);
- RouteInfo child = sGlobal.getRoute(uniqueChildId);
- if (child != null) {
- routes.add(child);
- if (!changed && !mRoutes.contains(child)) {
+ changed = groupMemberIds.size() != mRoutes.size();
+ for (String groupMemberId : groupMemberIds) {
+ String uniqueId = sGlobal.getUniqueId(getProvider(), groupMemberId);
+ RouteInfo groupMember = sGlobal.getRoute(uniqueId);
+ if (groupMember != null) {
+ routes.add(groupMember);
+ if (!changed && !mRoutes.contains(groupMember)) {
changed = true;
}
}
@@ -1784,7 +1784,7 @@
private RouteInfo mDefaultRoute;
private RouteInfo mSelectedRoute;
private RouteController mSelectedRouteController;
- private Map<String, RouteController> mChildControllers;
+ private Map<String, RouteController> mGroupMemberControllers;
private MediaRouteDiscoveryRequest mDiscoveryRequest;
private MediaSessionRecord mMediaSession;
private MediaSessionCompat mRccMediaSession;
@@ -1875,8 +1875,8 @@
public void requestSetVolume(RouteInfo route, int volume) {
if (route == mSelectedRoute && mSelectedRouteController != null) {
mSelectedRouteController.onSetVolume(volume);
- } else if (mChildControllers != null) {
- RouteController controller = mChildControllers.get(route.mDescriptorId);
+ } else if (mGroupMemberControllers != null) {
+ RouteController controller = mGroupMemberControllers.get(route.mDescriptorId);
if (controller != null) {
controller.onSetVolume(volume);
}
@@ -2120,7 +2120,7 @@
if (sourceIndex < 0) {
// 1. Add the route to the list.
String uniqueId = assignRouteUniqueId(provider, id);
- boolean isGroup = routeDescriptor.getChildIds() != null;
+ boolean isGroup = routeDescriptor.getGroupMemberIds() != null;
RouteInfo route = isGroup ? new RouteGroup(provider, id, uniqueId) :
new RouteInfo(provider, id, uniqueId);
provider.mRoutes.add(targetIndex++, route);
@@ -2362,12 +2362,12 @@
mSelectedRouteController.onRelease();
mSelectedRouteController = null;
}
- if (mChildControllers != null) {
- for (RouteController ctrl : mChildControllers.values()) {
- ctrl.onUnselect();
- ctrl.onRelease();
+ if (mGroupMemberControllers != null) {
+ for (RouteController controller : mGroupMemberControllers.values()) {
+ controller.onUnselect();
+ controller.onRelease();
}
- mChildControllers = null;
+ mGroupMemberControllers = null;
}
}
@@ -2385,13 +2385,13 @@
mCallbackHandler.post(CallbackHandler.MSG_ROUTE_SELECTED, mSelectedRoute);
if (mSelectedRoute instanceof RouteGroup) {
- mChildControllers = new HashMap<>();
+ mGroupMemberControllers = new HashMap<>();
RouteGroup group = (RouteGroup) mSelectedRoute;
- for (RouteInfo child : group.getRoutes()) {
- RouteController controller = child.getProviderInstance()
- .onCreateRouteController(child.mDescriptorId);
+ for (RouteInfo groupMember : group.getRoutes()) {
+ RouteController controller = groupMember.getProviderInstance()
+ .onCreateRouteController(groupMember.mDescriptorId);
controller.onSelect();
- mChildControllers.put(child.mDescriptorId, controller);
+ mGroupMemberControllers.put(groupMember.mDescriptorId, controller);
}
}
}
