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

am fd3fd482: Merge "Update route count properly when MediaRouteButton detects grouped/ungrouped events" into jb-dev

Browse Source 
* commit 'fd3fd482ab6ab67b687696f51fa67714bd36fa49':
  Update route count properly when MediaRouteButton detects grouped/ungrouped events
This commit is contained in:
Adam Powell
2012-06-23 05:36:54 -07:00
committed by Android Git Automerger
parent b9975454ed fd3fd482ab
commit 3b939b7242
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/app/MediaRouteButton.java
View File

@@ -374,5 +374,16 @@ public class MediaRouteButton extends View {
public void onRouteRemoved(MediaRouter router, RouteInfo info) {
updateRouteCount();
}
@Override
public void onRouteGrouped(MediaRouter router, RouteInfo info, RouteGroup group,
int index) {
updateRouteCount();
}
@Override
public void onRouteUngrouped(MediaRouter router, RouteInfo info, RouteGroup group) {
updateRouteCount();
}
}
}

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

@@ -1152,8 +1152,8 @@ public class MediaRouter {
route.mGroup = this;
mUpdateName = true;
updateVolume();
dispatchRouteGrouped(route, this, at);
routeUpdated();
dispatchRouteGrouped(route, this, at);
}
/**
@@ -1176,8 +1176,8 @@ public class MediaRouter {
route.mGroup = this;
mUpdateName = true;
updateVolume();
dispatchRouteGrouped(route, this, insertAt);
routeUpdated();
dispatchRouteGrouped(route, this, insertAt);
}
/**