diff options
| author | Jeff Brown <jeffbrown@google.com> | 2013-11-08 01:36:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-08 01:36:55 +0000 |
| commit | d40a4d74c623175c96a2e9d865a99826e56d1132 (patch) | |
| tree | 8fcb8823aab60b909ff4962d5b00fdd5681ad806 /core/java/com | |
| parent | 1f7a8a06256907e03405f89108f081289c23e97a (diff) | |
| parent | 69b07161bebdb2c726e3a826c2268866f1a94517 (diff) | |
| download | frameworks_base-d40a4d74c623175c96a2e9d865a99826e56d1132.zip frameworks_base-d40a4d74c623175c96a2e9d865a99826e56d1132.tar.gz frameworks_base-d40a4d74c623175c96a2e9d865a99826e56d1132.tar.bz2 | |
Merge "Add media router service and integrate with remote displays." into klp-dev
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/app/MediaRouteChooserDialogFragment.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/com/android/internal/app/MediaRouteChooserDialogFragment.java b/core/java/com/android/internal/app/MediaRouteChooserDialogFragment.java index e300021..268dcf6 100644 --- a/core/java/com/android/internal/app/MediaRouteChooserDialogFragment.java +++ b/core/java/com/android/internal/app/MediaRouteChooserDialogFragment.java @@ -501,7 +501,7 @@ public class MediaRouteChooserDialogFragment extends DialogFragment { final RouteInfo route = (RouteInfo) item; if (type == VIEW_ROUTE) { - mRouter.selectRouteInt(mRouteTypes, route); + mRouter.selectRouteInt(mRouteTypes, route, true); dismiss(); } else if (type == VIEW_GROUPING_ROUTE) { final Checkable c = (Checkable) view; @@ -514,7 +514,7 @@ public class MediaRouteChooserDialogFragment extends DialogFragment { if (mRouter.getSelectedRoute(mRouteTypes) == oldGroup) { // Old group was selected but is now empty. Select the group // we're manipulating since that's where the last route went. - mRouter.selectRouteInt(mRouteTypes, mEditingGroup); + mRouter.selectRouteInt(mRouteTypes, mEditingGroup, true); } oldGroup.removeRoute(route); mEditingGroup.addRoute(route); @@ -555,7 +555,7 @@ public class MediaRouteChooserDialogFragment extends DialogFragment { mEditingGroup = group; mCategoryEditingGroups = group.getCategory(); getDialog().setCanceledOnTouchOutside(false); - mRouter.selectRouteInt(mRouteTypes, mEditingGroup); + mRouter.selectRouteInt(mRouteTypes, mEditingGroup, true); update(); scrollToEditingGroup(); } |