Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "MediaRouter group volume reporting" into jb-dev

Browse Source
This commit is contained in:
Adam Powell
2012-06-21 00:12:04 -07:00
committed by Android (Google) Code Review
parent da036c8a57 f8ac14a7f5
commit d7c00d2bdd
1 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
media/java/android/media/MediaRouter.java
View File

@@ -1033,6 +1033,9 @@ public class MediaRouter {
mVolume = volume; mVolume = volume;
setPlaybackInfoOnRcc(RemoteControlClient.PLAYBACKINFO_VOLUME, volume); setPlaybackInfoOnRcc(RemoteControlClient.PLAYBACKINFO_VOLUME, volume);
dispatchRouteVolumeChanged(this); dispatchRouteVolumeChanged(this);
if (mGroup != null) {
mGroup.memberVolumeChanged(this);
}
} }
} }
@@ -1148,6 +1151,7 @@ public class MediaRouter {
mRoutes.add(route); mRoutes.add(route);
route.mGroup = this; route.mGroup = this;
mUpdateName = true; mUpdateName = true;
updateVolume();
dispatchRouteGrouped(route, this, at); dispatchRouteGrouped(route, this, at);
routeUpdated(); routeUpdated();
} }
@@ -1171,6 +1175,7 @@ public class MediaRouter {
mRoutes.add(insertAt, route); mRoutes.add(insertAt, route);
route.mGroup = this; route.mGroup = this;
mUpdateName = true; mUpdateName = true;
updateVolume();
dispatchRouteGrouped(route, this, insertAt); dispatchRouteGrouped(route, this, insertAt);
routeUpdated(); routeUpdated();
} }
@@ -1188,6 +1193,7 @@ public class MediaRouter {
mRoutes.remove(route); mRoutes.remove(route);
route.mGroup = null; route.mGroup = null;
mUpdateName = true; mUpdateName = true;
updateVolume();
dispatchRouteUngrouped(route, this); dispatchRouteUngrouped(route, this);
routeUpdated(); routeUpdated();
} }
@@ -1201,6 +1207,7 @@ public class MediaRouter {
RouteInfo route = mRoutes.remove(index); RouteInfo route = mRoutes.remove(index);
route.mGroup = null; route.mGroup = null;
mUpdateName = true; mUpdateName = true;
updateVolume();
dispatchRouteUngrouped(route, this); dispatchRouteUngrouped(route, this);
routeUpdated(); routeUpdated();
} }
@@ -1270,11 +1277,15 @@ public class MediaRouter {
} }
final int routeCount = getRouteCount(); final int routeCount = getRouteCount();
int volume = 0;
for (int i = 0; i < routeCount; i++) { for (int i = 0; i < routeCount; i++) {
final RouteInfo route = getRouteAt(i); final RouteInfo route = getRouteAt(i);
route.requestUpdateVolume(direction); route.requestUpdateVolume(direction);
final int routeVol = route.getVolume();
if (routeVol > volume) {
volume = routeVol;
}
} }
final int volume = Math.max(0, Math.min(mVolume + direction, maxVol));
if (volume != mVolume) { if (volume != mVolume) {
mVolume = volume; mVolume = volume;
dispatchRouteVolumeChanged(this); dispatchRouteVolumeChanged(this);
@@ -1290,6 +1301,26 @@ public class MediaRouter {
setStatusInt(status); setStatusInt(status);
} }
void memberVolumeChanged(RouteInfo info) {
updateVolume();
}
void updateVolume() {
// A group always represents the highest component volume value.
final int routeCount = getRouteCount();
int volume = 0;
for (int i = 0; i < routeCount; i++) {
final int routeVol = getRouteAt(i).getVolume();
if (routeVol > volume) {
volume = routeVol;
}
}
if (volume != mVolume) {
mVolume = volume;
dispatchRouteVolumeChanged(this);
}
}
@Override @Override
void routeUpdated() { void routeUpdated() {
int types = 0; int types = 0;