commit 697ff1cbd5efee431fb10c74b31071cf95341203
author Prameet Shah <phshah@google.com> Tue Jul 16 16:22:23 2013 -0700
committer Prameet Shah <phshah@google.com> Tue Jul 16 16:24:42 2013 -0700
tree d33abcd06620db4a1e1594cb520c28c3deaec93c
parent e89a8faedc7cd848f2a6984d215f9ae90f7d1b2b

Adding the overridden control view to the layout instead of the control
frame in MediaRouterControllerDialog.

Change-Id: Id22db360b8c840a1c17980cea339ea35b1bb9bb1

v7/mediarouter/src/android/support/v7/app/MediaRouteControllerDialog.java

diff --git a/v7/mediarouter/src/android/support/v7/app/MediaRouteControllerDialog.java b/v7/mediarouter/src/android/support/v7/app/MediaRouteControllerDialog.java
index 8f18972..73cd2fa 100644
--- a/v7/mediarouter/src/android/support/v7/app/MediaRouteControllerDialog.java
+++ b/v7/mediarouter/src/android/support/v7/app/MediaRouteControllerDialog.java
@@ -170,11 +170,13 @@
         mCreated = true;
         if (update()) {
             mControlView = onCreateMediaControlView(savedInstanceState);
+            FrameLayout controlFrame =
+                    (FrameLayout)findViewById(R.id.media_route_control_frame);
             if (mControlView != null) {
-                FrameLayout controlFrame =
-                        (FrameLayout)findViewById(R.id.media_route_control_frame);
-                controlFrame.addView(controlFrame);
+                controlFrame.addView(mControlView);
                 controlFrame.setVisibility(View.VISIBLE);
+            } else {
+                controlFrame.setVisibility(View.GONE);
             }
         }
     }