Merge "MediaRouter: MediaRouteChooserDialog layout" into mnc-ub-dev
diff --git a/v7/mediarouter/res/layout/mr_media_route_chooser_dialog.xml b/v7/mediarouter/res/layout/mr_media_route_chooser_dialog.xml
index 393d4fb..6608f9a 100644
--- a/v7/mediarouter/res/layout/mr_media_route_chooser_dialog.xml
+++ b/v7/mediarouter/res/layout/mr_media_route_chooser_dialog.xml
@@ -29,18 +29,20 @@
<LinearLayout android:id="@android:id/empty"
android:layout_width="fill_parent"
- android:layout_height="64dp"
- android:orientation="horizontal"
+ android:layout_height="240dp"
+ android:orientation="vertical"
+ android:paddingTop="90dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:visibility="gone">
- <ProgressBar android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center" />
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:paddingLeft="16dp"
android:text="@string/mr_media_route_chooser_searching" />
+ <ProgressBar android:layout_width="150dp"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:indeterminate="true"
+ style="?android:attr/progressBarStyleHorizontal" />
</LinearLayout>
</LinearLayout>
diff --git a/v7/mediarouter/res/values/strings.xml b/v7/mediarouter/res/values/strings.xml
index 70df280..b621522 100644
--- a/v7/mediarouter/res/values/strings.xml
+++ b/v7/mediarouter/res/values/strings.xml
@@ -29,7 +29,7 @@
<string name="mr_media_route_chooser_title">Cast to</string>
<!-- Placeholder text to show when no devices have been found. [CHAR LIMIT=50] -->
- <string name="mr_media_route_chooser_searching">Searching for devices\u2026</string>
+ <string name="mr_media_route_chooser_searching">Finding devices</string>
<!-- Button to disconnect from a media route. [CHAR LIMIT=30] -->
<string name="mr_media_route_controller_disconnect">Disconnect</string>
