Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95cf8c11 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

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

parents e06e1619 f7e0a328

core/java/android/app/MediaRouteButton.java

+8 −2
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ import android.content.res.TypedArray; 
import android.graphics.Canvas;

import android.graphics.Canvas;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Drawable;

import android.media.MediaRouter;

import android.media.MediaRouter;

import android.media.MediaRouter.RouteGroup;

import android.media.MediaRouter.RouteInfo;

import android.media.MediaRouter.RouteInfo;

import android.util.AttributeSet;

import android.util.AttributeSet;

import android.util.Log;

import android.util.Log;
@@ -157,10 +158,15 @@ public class MediaRouteButton extends View { 
        final int N = mRouter.getRouteCount();

        final int N = mRouter.getRouteCount();

        int count = 0;

        int count = 0;

        for (int i = 0; i < N; i++) {

        for (int i = 0; i < N; i++) {

            if ((mRouter.getRouteAt(i).getSupportedTypes() & mRouteTypes) != 0) {

            final RouteInfo route = mRouter.getRouteAt(i);

            if ((route.getSupportedTypes() & mRouteTypes) != 0) {

                if (route instanceof RouteGroup) {

                    count += ((RouteGroup) route).getRouteCount();

                } else {

                    count++;

                    count++;

                }

                }

            }

            }

        }





        setEnabled(count != 0);

        setEnabled(count != 0);