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

am 95cf8c11: Merge "Allow ungrouping media routes when a group is the only alternate route" into jb-dev

Browse Source 
* commit '95cf8c1121a95750358ee99169c96d8d4dfb4950':
  Allow ungrouping media routes when a group is the only alternate route
This commit is contained in:
Adam Powell
2012-06-21 15:52:28 -07:00
committed by Android Git Automerger
parent eef58e858a 95cf8c1121
commit 8e453a0341
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,7 @@ import android.content.res.TypedArray;
import android.graphics.Canvas;
import android.graphics.drawable.Drawable;
import android.media.MediaRouter;
import android.media.MediaRouter.RouteGroup;
import android.media.MediaRouter.RouteInfo;
import android.util.AttributeSet;
import android.util.Log;
@@ -157,8 +158,13 @@ public class MediaRouteButton extends View {
final int N = mRouter.getRouteCount();
int count = 0;
for (int i = 0; i < N; i++) {
if ((mRouter.getRouteAt(i).getSupportedTypes() & mRouteTypes) != 0) {
count++;
final RouteInfo route = mRouter.getRouteAt(i);
if ((route.getSupportedTypes() & mRouteTypes) != 0) {
if (route instanceof RouteGroup) {
count += ((RouteGroup) route).getRouteCount();
} else {
count++;
}
}
}