Integrate new UI/UX designs for media router dialog

Bug: 275073444
Test: Manually using Sample App
Change-Id: I0cad92f947e8e5573bcea224f4cab9d2f08f7376
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/DeviceUtils.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/DeviceUtils.java
new file mode 100644
index 0000000..925a344
--- /dev/null
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/DeviceUtils.java
@@ -0,0 +1,243 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.mediarouter.app;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.hardware.Sensor;
+import android.hardware.SensorManager;
+import android.os.Build;
+
+import androidx.annotation.Dimension;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.mediarouter.R;
+
+/** Utility methods for checking properties of the current device. */
+final class DeviceUtils {
+    @Nullable
+    private static Boolean sIsPhone;
+    @Nullable
+    private static Boolean sIsTablet;
+    @Nullable
+    private static Boolean sIsFoldable;
+    @Nullable
+    private static Boolean sIsSevenInchTablet;
+    @Nullable
+    private static Boolean sIsWearable;
+    @Nullable
+    private static Boolean sIsAuto;
+    @Nullable
+    private static Boolean sIsTv;
+
+    /** The feature name for Auto devices. */
+    private static final String FEATURE_AUTO = "android.hardware.type.automotive";
+
+    /** The feature names for TV devices, either of which will qualify. */
+    private static final String FEATURE_TV_1 = "com.google.android.tv";
+
+    private static final String FEATURE_TV_2 = "android.hardware.type.television";
+    private static final String FEATURE_TV_3 = "android.software.leanback";
+
+    /** The minimum screen width for a 7-inch tablet. */
+    private static final @Dimension(unit = Dimension.DP) int
+            SEVEN_INCH_TABLET_MINIMUM_SCREEN_WIDTH_DP = 600;
+
+    private DeviceUtils() {
+    }
+
+    /**
+     * Returns a string representation of a device form factor. Supported form factors are:
+     * {@link #{R.string.mr_device_form_factor_phone} and
+     * @link #{R.string.mr_device_form_factor_tablet} and
+     * @link #{R.string.mr_device_form_factor_tv} and
+     * @link #{R.string.mr_device_form_factor_watch} and
+     * @link #{R.string.mr_device_form_factor_car} and
+     * @link #{R.string.mr_device_form_factor_unknown}}
+     */
+    static String getDeviceFormFactorString(@NonNull Context context) {
+        if (isPhone(context) || isFoldable(context)) {
+            return context.getString(R.string.mr_device_form_factor_phone);
+        } else if (isTablet(context) || isSevenInchTablet(context)) {
+            return context.getString(R.string.mr_device_form_factor_tablet);
+        } else if (isTv(context)) {
+            return context.getString(R.string.mr_device_form_factor_tv);
+        } else if (isWearable(context)) {
+            return context.getString(R.string.mr_device_form_factor_watch);
+        } else if (isAuto(context)) {
+            return context.getString(R.string.mr_device_form_factor_car);
+        } else {
+            return context.getString(R.string.mr_device_form_factor_unknown);
+        }
+    }
+
+    /** Returns {@code true} if the current device is considered a phone. */
+    private static boolean isPhone(@NonNull Context context) {
+        if (sIsPhone == null) {
+            sIsPhone =
+                    (!isTablet(context)
+                            && !isWearable(context)
+                            && !isAuto(context)
+                            && !isTv(context));
+        }
+        return sIsPhone;
+    }
+
+    /** Returns {@code true} if the current device considered a tablet (Honeycomb+ and XLarge). */
+    private static boolean isTablet(@NonNull Context context) {
+        return isTablet(context.getResources());
+    }
+
+    /** Returns {@code true} if the current device considered a tablet (Honeycomb+ and XLarge). */
+    private static boolean isTablet(@NonNull Resources resources) {
+        if (resources == null) {
+            return false;
+        }
+        if (sIsTablet == null) {
+            // Consider it to be tablet if it's either a) xlarge-v11, or b) sw600dp-v13.
+            boolean isXlarge =
+                    (resources.getConfiguration().screenLayout
+                            & Configuration.SCREENLAYOUT_SIZE_MASK)
+                            > Configuration.SCREENLAYOUT_SIZE_LARGE;
+            sIsTablet = isXlarge || isSevenInchTablet(resources);
+        }
+        return sIsTablet;
+    }
+
+    /**
+     * Returns {@code true} if the current device considered a foldable (R+ and has a hinge).
+     *
+     * <p>Note: this is not mutually exclusive with {@link #sIsPhone}
+     */
+    private static boolean isFoldable(@NonNull Context context) {
+        if (sIsFoldable == null) {
+            SensorManager sensorManager =
+                    (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
+            sIsFoldable =
+                    Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
+                            && sensorManager != null
+                            && sensorManager.getDefaultSensor(Sensor.TYPE_HINGE_ANGLE) != null;
+        }
+        return sIsFoldable;
+    }
+
+    /**
+     * Returns {@code true} if the current device is considered to be a 7-inch tablet (e.g. and not
+     * a 10-inch tablet).
+     */
+    private static boolean isSevenInchTablet(@NonNull Context context) {
+        return isSevenInchTablet(context.getResources());
+    }
+
+    /**
+     * Returns {@code true} if the current device is considered to be a 7-inch tablet (e.g. and not
+     * a 10-inch tablet).
+     */
+    private static boolean isSevenInchTablet(@NonNull Resources resources) {
+        if (resources == null) {
+            return false;
+        }
+        if (sIsSevenInchTablet == null) {
+            Configuration configuration = resources.getConfiguration();
+            sIsSevenInchTablet =
+                    (configuration.screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK)
+                            <= Configuration.SCREENLAYOUT_SIZE_LARGE
+                            && configuration.smallestScreenWidthDp
+                            >= SEVEN_INCH_TABLET_MINIMUM_SCREEN_WIDTH_DP;
+        }
+        return sIsSevenInchTablet;
+    }
+
+    /**
+     * Returns {@code true} if the current device is a wearable. As of 2019Q4, that is synonymous
+     * with being a watch.
+     *
+     * <p>For container release builds, returns {@code true} if the build type is {@code WEARABLE}
+     * and {@code false} for all other build types.
+     */
+    private static boolean isWearable(@NonNull Context context) {
+        return isWearable(context.getPackageManager());
+    }
+
+    /**
+     * Returns {@code true} if the current device is a wearable. As of 2019Q4, that is synonymous
+     * with being a watch.
+     *
+     * <p>For container release builds, returns {@code true} if the build type is {@code WEARABLE}
+     * and {@code false} for all other build types.
+     */
+    private static boolean isWearable(@NonNull PackageManager packageManager) {
+        if (sIsWearable == null) {
+            sIsWearable =
+                    Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT_WATCH
+                            && packageManager.hasSystemFeature(PackageManager.FEATURE_WATCH);
+        }
+        return sIsWearable;
+    }
+
+    /**
+     * Returns {@code true} if the device should be considered as a car.
+     *
+     * <p>For container release builds, returns {@code true} if the build type is {@code AUTO} and
+     * {@code false} for all other build types.
+     */
+    private static boolean isAuto(@NonNull Context context) {
+        return isAuto(context.getPackageManager());
+    }
+
+    /**
+     * Returns {@code true} if the device should be considered as a car.
+     *
+     * <p>For container release builds, returns {@code true} if the build type is {@code AUTO} and
+     * {@code false} for all other build types.
+     */
+    private static boolean isAuto(@NonNull PackageManager packageManager) {
+        if (sIsAuto == null) {
+            sIsAuto = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
+                    && packageManager.hasSystemFeature(FEATURE_AUTO);
+        }
+        return sIsAuto;
+    }
+
+    /**
+     * Returns {@code true} if the device should be considered as a TV.
+     *
+     * <p>For container release builds, returns {@code true} if the build type is {@code ATV} and
+     * {@code false} for all other build types except {@code PHONE_PRE_LMP} (aka {@code PROD}).
+     */
+    private static boolean isTv(@NonNull Context context) {
+        return DeviceUtils.isTv(context.getPackageManager());
+    }
+
+    /**
+     * Returns {@code true} if the device should be considered as a TV.
+     *
+     * <p>For container release builds, returns {@code true} if the build type is {@code ATV} and
+     * {@code false} for all other build types except {@code PHONE_PRE_LMP} (aka {@code PROD}).
+     */
+    private static boolean isTv(@NonNull PackageManager packageManager) {
+        if (sIsTv == null) {
+            sIsTv =
+                    packageManager.hasSystemFeature(FEATURE_TV_1)
+                            || packageManager.hasSystemFeature(FEATURE_TV_2)
+                            || packageManager.hasSystemFeature(FEATURE_TV_3);
+        }
+        return sIsTv;
+    }
+}
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteChooserDialog.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteChooserDialog.java
index 51e6cb0..13c2dc7 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteChooserDialog.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteChooserDialog.java
@@ -37,7 +37,6 @@
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
@@ -80,23 +79,26 @@
     private static final int MSG_UPDATE_ROUTES = 1;
     private static final int MSG_SHOW_WIFI_HINT = 2;
     private static final int MSG_SHOW_NO_ROUTES = 3;
-
     private static final int SHOW_WIFI_HINT_DELAY_MS = 5000;
     private static final int SHOW_NO_ROUTES_DELAY_MS = 15000;
 
     private final MediaRouter mRouter;
     private final MediaRouterCallback mCallback;
-
-    private TextView mTitleView;
     private MediaRouteSelector mSelector = MediaRouteSelector.EMPTY;
     private ArrayList<MediaRouter.RouteInfo> mRoutes;
-    private RouteAdapter mAdapter;
+
+    // UI View elements
+    private TextView mTitleView;
+    private TextView mSearchingRoutesTextView;
+    private RelativeLayout mWifiWarningContainer;
+    private TextView mWifiWarningTextView;
+    private TextView mLearnMoreTextView;
+    private LinearLayout mOkButtonContainer;
+    private Button mOkButton;
+    private ProgressBar mSearchingProgressBar;
     private ListView mListView;
-    private RelativeLayout mEmptyView;
-    private LinearLayout mSearchingRoutesView;
-    private FrameLayout mNoRoutesView;
-    private FrameLayout mWifiWarningView;
-    private FrameLayout mFooterView;
+    private RouteAdapter mAdapter;
+
     private boolean mAttachedToWindow;
     private long mLastUpdateTime;
     @SuppressWarnings({"unchecked", "deprecation"})
@@ -224,25 +226,30 @@
 
         mRoutes = new ArrayList<>();
         mAdapter = new RouteAdapter(getContext(), mRoutes);
+
+        mTitleView = findViewById(R.id.mr_chooser_title);
+
+        mSearchingRoutesTextView = findViewById(R.id.mr_chooser_searching);
+        mWifiWarningContainer = findViewById(R.id.mr_chooser_wifi_warning_container);
+        mWifiWarningTextView = findViewById(R.id.mr_chooser_wifi_warning_description);
+        mLearnMoreTextView = findViewById(R.id.mr_chooser_wifi_learn_more);
+        mOkButtonContainer = findViewById(R.id.mr_chooser_ok_button_container);
+        mOkButton = findViewById(R.id.mr_chooser_ok_button);
+        mSearchingProgressBar = findViewById(R.id.mr_chooser_search_progress_bar);
+
+
+        String formFactor = DeviceUtils.getDeviceFormFactorString(getContext());
+        String wifiWarningText =
+                getContext().getString(R.string.mr_chooser_wifi_warning_description, formFactor);
+        mWifiWarningTextView.setText(wifiWarningText);
+
+        mLearnMoreTextView.setMovementMethod(LinkMovementMethod.getInstance());
+        mOkButton.setOnClickListener(view -> dismiss());
+
         mListView = findViewById(R.id.mr_chooser_list);
         mListView.setAdapter(mAdapter);
         mListView.setOnItemClickListener(mAdapter);
         mListView.setEmptyView(findViewById(android.R.id.empty));
-        mTitleView = findViewById(R.id.mr_chooser_title);
-
-        mEmptyView = findViewById(R.id.mr_empty_view);
-        mSearchingRoutesView = findViewById(R.id.mr_chooser_searching);
-        mNoRoutesView = findViewById(R.id.mr_chooser_no_routes);
-        mWifiWarningView = findViewById(R.id.mr_chooser_wifi_warning);
-        mFooterView = findViewById(R.id.mr_chooser_footer);
-
-        TextView zeroRoutesDescription = findViewById(R.id.mr_chooser_zero_routes_description);
-        TextView wifiWarningDescription = findViewById(R.id.mr_chooser_wifi_warning_description);
-        Button doneButton = findViewById(R.id.mr_chooser_done_button);
-
-        zeroRoutesDescription.setMovementMethod(LinkMovementMethod.getInstance());
-        wifiWarningDescription.setMovementMethod(LinkMovementMethod.getInstance());
-        doneButton.setOnClickListener(view -> dismiss());
 
         updateLayout();
     }
@@ -342,63 +349,63 @@
 
     void updateViewForState(@MediaRouterChooserDialogState int state) {
         switch (state) {
-            case NO_ROUTES:
-                updateViewForNoRoutes();
+            case FINDING_DEVICES:
+                updateViewForFindingDevices();
                 break;
             case NO_DEVICES_NO_WIFI_HINT:
                 updateViewForNoDevicesNoWifiHint();
                 break;
+            case NO_ROUTES:
+                updateViewForNoRoutes();
+                break;
             case SHOWING_ROUTES:
                 updateViewForShowingRoutes();
                 break;
-            case FINDING_DEVICES:
-                updateViewForFindingDevices();
-                break;
         }
     }
 
-    private void updateViewForNoRoutes() {
-        setTitle(R.string.mr_chooser_zero_routes_found_title);
-        mTitleView.setVisibility(View.VISIBLE);
+    private void updateViewForFindingDevices() {
+        setTitle(R.string.mr_chooser_title);
         mListView.setVisibility(View.GONE);
-        mEmptyView.setVisibility(View.VISIBLE);
-        mFooterView.setVisibility(View.VISIBLE);
-        mNoRoutesView.setVisibility(View.VISIBLE);
-        mSearchingRoutesView.setVisibility(View.GONE);
-        mWifiWarningView.setVisibility(View.GONE);
+        mSearchingRoutesTextView.setVisibility(View.VISIBLE);
+        mSearchingProgressBar.setVisibility(View.VISIBLE);
+        mOkButtonContainer.setVisibility(View.GONE);
+        mOkButton.setVisibility(View.GONE);
+        mLearnMoreTextView.setVisibility(View.GONE);
+        mWifiWarningContainer.setVisibility(View.GONE);
     }
 
     private void updateViewForNoDevicesNoWifiHint() {
         setTitle(R.string.mr_chooser_title);
-        mTitleView.setVisibility(View.VISIBLE);
         mListView.setVisibility(View.GONE);
-        mEmptyView.setVisibility(View.VISIBLE);
-        mFooterView.setVisibility(View.GONE);
-        mNoRoutesView.setVisibility(View.GONE);
-        mSearchingRoutesView.setVisibility(View.VISIBLE);
-        mWifiWarningView.setVisibility(View.VISIBLE);
+        mSearchingRoutesTextView.setVisibility(View.GONE);
+        mSearchingProgressBar.setVisibility(View.VISIBLE);
+        mOkButtonContainer.setVisibility(View.GONE);
+        mOkButton.setVisibility(View.GONE);
+        mLearnMoreTextView.setVisibility(View.INVISIBLE);
+        mWifiWarningContainer.setVisibility(View.VISIBLE);
+    }
+
+    private void updateViewForNoRoutes() {
+        setTitle(R.string.mr_chooser_zero_routes_found_title);
+        mListView.setVisibility(View.GONE);
+        mSearchingRoutesTextView.setVisibility(View.GONE);
+        mSearchingProgressBar.setVisibility(View.GONE);
+        mOkButtonContainer.setVisibility(View.VISIBLE);
+        mOkButton.setVisibility(View.VISIBLE);
+        mLearnMoreTextView.setVisibility(View.VISIBLE);
+        mWifiWarningContainer.setVisibility(View.VISIBLE);
     }
 
     private void updateViewForShowingRoutes() {
         setTitle(R.string.mr_chooser_title);
-        mTitleView.setVisibility(View.VISIBLE);
         mListView.setVisibility(View.VISIBLE);
-        mEmptyView.setVisibility(View.GONE);
-        mFooterView.setVisibility(View.GONE);
-        mNoRoutesView.setVisibility(View.GONE);
-        mSearchingRoutesView.setVisibility(View.GONE);
-        mWifiWarningView.setVisibility(View.GONE);
-    }
-
-    private void updateViewForFindingDevices() {
-        setTitle(R.string.mr_chooser_title);
-        mTitleView.setVisibility(View.VISIBLE);
-        mListView.setVisibility(View.GONE);
-        mEmptyView.setVisibility(View.VISIBLE);
-        mFooterView.setVisibility(View.GONE);
-        mNoRoutesView.setVisibility(View.GONE);
-        mSearchingRoutesView.setVisibility(View.VISIBLE);
-        mWifiWarningView.setVisibility(View.GONE);
+        mSearchingRoutesTextView.setVisibility(View.GONE);
+        mSearchingProgressBar.setVisibility(View.GONE);
+        mOkButtonContainer.setVisibility(View.GONE);
+        mOkButton.setVisibility(View.GONE);
+        mLearnMoreTextView.setVisibility(View.GONE);
+        mWifiWarningContainer.setVisibility(View.GONE);
     }
 
     private static final class RouteAdapter extends ArrayAdapter<MediaRouter.RouteInfo>
diff --git a/mediarouter/mediarouter/src/main/res/drawable-hdpi/ic_mr_wifi_icon_dark.png b/mediarouter/mediarouter/src/main/res/drawable-hdpi/ic_mr_wifi_icon_dark.png
new file mode 100644
index 0000000..76e0687a
--- /dev/null
+++ b/mediarouter/mediarouter/src/main/res/drawable-hdpi/ic_mr_wifi_icon_dark.png
Binary files differ
diff --git a/mediarouter/mediarouter/src/main/res/drawable-hdpi/ic_mr_wifi_icon_light.png b/mediarouter/mediarouter/src/main/res/drawable-hdpi/ic_mr_wifi_icon_light.png
new file mode 100644
index 0000000..6ebde6d
--- /dev/null
+++ b/mediarouter/mediarouter/src/main/res/drawable-hdpi/ic_mr_wifi_icon_light.png
Binary files differ
diff --git a/mediarouter/mediarouter/src/main/res/drawable-mdpi/ic_mr_wifi_icon_dark.png b/mediarouter/mediarouter/src/main/res/drawable-mdpi/ic_mr_wifi_icon_dark.png
new file mode 100644
index 0000000..0285b40
--- /dev/null
+++ b/mediarouter/mediarouter/src/main/res/drawable-mdpi/ic_mr_wifi_icon_dark.png
Binary files differ
diff --git a/mediarouter/mediarouter/src/main/res/drawable-mdpi/ic_mr_wifi_icon_light.png b/mediarouter/mediarouter/src/main/res/drawable-mdpi/ic_mr_wifi_icon_light.png
new file mode 100644
index 0000000..a3ccd85
--- /dev/null
+++ b/mediarouter/mediarouter/src/main/res/drawable-mdpi/ic_mr_wifi_icon_light.png
Binary files differ
diff --git a/mediarouter/mediarouter/src/main/res/drawable-xhdpi/ic_mr_wifi_icon_dark.png b/mediarouter/mediarouter/src/main/res/drawable-xhdpi/ic_mr_wifi_icon_dark.png
new file mode 100644
index 0000000..b4bd8be
--- /dev/null
+++ b/mediarouter/mediarouter/src/main/res/drawable-xhdpi/ic_mr_wifi_icon_dark.png
Binary files differ
diff --git a/mediarouter/mediarouter/src/main/res/drawable-xhdpi/ic_mr_wifi_icon_light.png b/mediarouter/mediarouter/src/main/res/drawable-xhdpi/ic_mr_wifi_icon_light.png
new file mode 100644
index 0000000..61f9715
--- /dev/null
+++ b/mediarouter/mediarouter/src/main/res/drawable-xhdpi/ic_mr_wifi_icon_light.png
Binary files differ
diff --git a/mediarouter/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_wifi_icon_dark.png b/mediarouter/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_wifi_icon_dark.png
new file mode 100644
index 0000000..16e58a9
--- /dev/null
+++ b/mediarouter/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_wifi_icon_dark.png
Binary files differ
diff --git a/mediarouter/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_wifi_icon_light.png b/mediarouter/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_wifi_icon_light.png
new file mode 100644
index 0000000..ca59395
--- /dev/null
+++ b/mediarouter/mediarouter/src/main/res/drawable-xxhdpi/ic_mr_wifi_icon_light.png
Binary files differ
diff --git a/mediarouter/mediarouter/src/main/res/drawable-xxxhdpi/ic_mr_wifi_icon_dark.png b/mediarouter/mediarouter/src/main/res/drawable-xxxhdpi/ic_mr_wifi_icon_dark.png
new file mode 100644
index 0000000..8807acb
--- /dev/null
+++ b/mediarouter/mediarouter/src/main/res/drawable-xxxhdpi/ic_mr_wifi_icon_dark.png
Binary files differ
diff --git a/mediarouter/mediarouter/src/main/res/drawable-xxxhdpi/ic_mr_wifi_icon_light.png b/mediarouter/mediarouter/src/main/res/drawable-xxxhdpi/ic_mr_wifi_icon_light.png
new file mode 100644
index 0000000..2d8a7c8
--- /dev/null
+++ b/mediarouter/mediarouter/src/main/res/drawable-xxxhdpi/ic_mr_wifi_icon_light.png
Binary files differ
diff --git a/mediarouter/mediarouter/src/main/res/drawable/mr_wifi_icon_dark.xml b/mediarouter/mediarouter/src/main/res/drawable/mr_wifi_icon_dark.xml
new file mode 100644
index 0000000..3153d7e
--- /dev/null
+++ b/mediarouter/mediarouter/src/main/res/drawable/mr_wifi_icon_dark.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_mr_wifi_icon_dark" />
+</selector>
diff --git a/mediarouter/mediarouter/src/main/res/drawable/mr_wifi_icon_light.xml b/mediarouter/mediarouter/src/main/res/drawable/mr_wifi_icon_light.xml
new file mode 100644
index 0000000..c6e75df
--- /dev/null
+++ b/mediarouter/mediarouter/src/main/res/drawable/mr_wifi_icon_light.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_mr_wifi_icon_light" />
+</selector>
diff --git a/mediarouter/mediarouter/src/main/res/layout/mr_chooser_dialog.xml b/mediarouter/mediarouter/src/main/res/layout/mr_chooser_dialog.xml
index c8978f7..5050bf4 100644
--- a/mediarouter/mediarouter/src/main/res/layout/mr_chooser_dialog.xml
+++ b/mediarouter/mediarouter/src/main/res/layout/mr_chooser_dialog.xml
@@ -32,6 +32,92 @@
         android:text="@string/mr_chooser_title"
         android:textAppearance="@style/TextAppearance.MediaRouter.Title" />
 
+    <TextView
+        android:id="@+id/mr_chooser_searching"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:text="@string/mr_chooser_looking_for_devices"
+        android:textAppearance="@style/TextAppearance.MediaRouter.SecondaryText" />
+
+    <RelativeLayout
+        android:id="@+id/mr_chooser_wifi_warning_container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone">
+
+        <LinearLayout
+            android:id="@+id/mr_chooser_wifi_warning"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="@dimen/mr_controller_wifi_icon_size"
+                android:layout_height="@dimen/mr_controller_wifi_icon_size"
+                android:layout_margin="16dp"
+                android:src="?attr/mediaRouteWifiIconDrawable"
+                android:contentDescription="@string/ic_media_route_learn_more_accessibility"/>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="24dp"
+                android:layout_marginStart="24dp"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/mr_chooser_wifi_warning_description"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/mr_chooser_wifi_warning_description"
+                    android:textAppearance="@style/TextAppearance.MediaRouter.SecondaryText" />
+
+                <TextView
+                    android:id="@+id/mr_chooser_wifi_learn_more"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:text="@string/mr_chooser_wifi_learn_more"
+                    android:textAppearance="@style/TextAppearance.MediaRouter.SecondaryText"
+                    android:visibility="invisible" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/mr_chooser_ok_button_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/mr_chooser_wifi_warning">
+
+            <Space
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+
+            <Button
+                android:id="@+id/mr_chooser_ok_button"
+                style="?android:attr/borderlessButtonStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@android:string/ok"
+                android:minWidth="0dp"
+                android:visibility="gone"/>
+
+        </LinearLayout>
+
+    </RelativeLayout>
+
+    <ProgressBar
+        android:id="@+id/mr_chooser_search_progress_bar"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:indeterminate="true" />
+
     <ListView
         android:id="@+id/mr_chooser_list"
         android:layout_width="fill_parent"
@@ -40,86 +126,4 @@
         android:dividerHeight="0dp"
         android:visibility="gone" />
 
-    <RelativeLayout
-        android:id="@+id/mr_empty_view"
-        android:layout_width="fill_parent"
-        android:layout_height="240dp"
-        android:visibility="visible">
-
-        <LinearLayout
-            android:id="@+id/mr_chooser_searching"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:orientation="vertical"
-            android:visibility="visible">
-
-            <ProgressBar
-                android:id="@+id/mr_chooser_search_progress_bar"
-                style="?android:attr/progressBarStyleHorizontal"
-                android:layout_width="150dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:indeterminate="true" />
-
-            <TextView
-                android:id="@+id/mr_chooser_search_status"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/mr_chooser_searching"
-                android:textAppearance="@style/TextAppearance.MediaRouter.SecondaryText" />
-
-        </LinearLayout>
-
-        <FrameLayout
-            android:id="@+id/mr_chooser_no_routes"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone">
-
-            <TextView
-                android:id="@+id/mr_chooser_zero_routes_description"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/mr_chooser_zero_routes_description"
-                android:textAppearance="@style/TextAppearance.MediaRouter.SecondaryText" />
-
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/mr_chooser_wifi_warning"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone">
-
-            <TextView
-                android:id="@+id/mr_chooser_wifi_warning_description"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/mr_chooser_wifi_warning_description"
-                android:textAppearance="@style/TextAppearance.MediaRouter.SecondaryText" />
-
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/mr_chooser_footer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:gravity="bottom"
-            android:visibility="gone">
-
-            <Button
-                android:id="@+id/mr_chooser_done_button"
-                style="?android:attr/borderlessButtonStyle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end|right"
-                android:text="@string/mr_chooser_done_button_label" />
-
-        </FrameLayout>
-
-    </RelativeLayout>
-
 </LinearLayout>
diff --git a/mediarouter/mediarouter/src/main/res/values-af/strings.xml b/mediarouter/mediarouter/src/main/res/values-af/strings.xml
index bd833f3..2560d60 100644
--- a/mediarouter/mediarouter/src/main/res/values-af/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-af/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Speel op \'n groep"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Geen inligting beskikbaar nie"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Geen toestelle beskikbaar nie"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Kan nie toestelle kry nie. Maak seker dat jou toestel en die uitsaaitoestel in dieselfde wi-fi-netwerk is en probeer weer."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Maak seker dat jou toestel en die uitsaaitoestel in dieselfde wi-fi-netwerk is."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Klaar"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-am/strings.xml b/mediarouter/mediarouter/src/main/res/values-am/strings.xml
index 4619b0d..b8d4461 100644
--- a/mediarouter/mediarouter/src/main/res/values-am/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-am/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"በቡድን ላይ ያጫውቱ"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"ምንም መረጃ አይገኝም"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"ምንም መሣሪያዎች አይገኙም"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"መሣሪያዎችን ማግኘት አልተቻለም፣ መሣሪያዎ እና የChromecast መሣሪያው በተመሳሳይ የWi-Fi አውታረ መረብ ላይ እንደሆኑ ያረጋግጡ እና እንደገና ይሞክሩ።"</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"መሣሪያዎ እና የChromecast መሣሪያው በተመሳሳይ የWi-Fi አውታረ መረብ ላይ እንደሆኑ ያረጋግጡ።"</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"ተከናውኗል"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-ar/strings.xml b/mediarouter/mediarouter/src/main/res/values-ar/strings.xml
index 7d41901..4fc753a 100644
--- a/mediarouter/mediarouter/src/main/res/values-ar/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-ar/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"تشغيل على مجموعة من الأجهزة"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"لا تتوفر أي معلومات"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"لا تتوفّر أي أجهزة"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"‏يتعذّر العثور على أجهزة. تأكَّد من أنّ جهازك وجهاز البثّ متصلان بشبكة Wi-Fi نفسها."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"‏تأكَّد من أنّ جهازك وجهاز البثّ متصلان بشبكة Wi-Fi نفسها."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"تم"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-as/strings.xml b/mediarouter/mediarouter/src/main/res/values-as/strings.xml
index 60b9c9f..c732471 100644
--- a/mediarouter/mediarouter/src/main/res/values-as/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-as/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"কোনো এটা গোটত প্লে’ কৰক"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"কোনো তথ্য নাই"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"কোনো ডিভাইচ উপলব্ধ নহয়"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"ডিভাইচ বিচাৰি পাবলৈ সক্ষম হোৱা নাই, আপোনাৰ ডিভাইচটো আৰু কাষ্ট কৰা ডিভাইচটো একেটা ৱাই-ফাই নেটৱৰ্কত থকাটো নিশ্চিত কৰক।"</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"আপোনাৰ ডিভাইচটো আৰু কাষ্ট কৰা ডিভাইচটো একেটা ৱাই-ফাই নেটৱৰ্কত থকাটো নিশ্চিত কৰক।"</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"কৰা হ’ল"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-az/strings.xml b/mediarouter/mediarouter/src/main/res/values-az/strings.xml
index 20ee3c1..c66e26c 100644
--- a/mediarouter/mediarouter/src/main/res/values-az/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-az/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Qrupda oxudun"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Əlçatan məlumat yoxdur"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Əlçatan cihaz yoxdur"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Cihazları tapmaq olmur. Cihaz və Yayım cihazının eyni Wi-Fi şəbəkəsində olduğuna əmin olub, yenidən cəhd edin."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Cihaz və Yayım cihazı eyni Wi-Fi şəbəkəsində olmalıdır."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Hazırdır"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-b+sr+Latn/strings.xml b/mediarouter/mediarouter/src/main/res/values-b+sr+Latn/strings.xml
index e27efdc..a8903dd 100644
--- a/mediarouter/mediarouter/src/main/res/values-b+sr+Latn/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-b+sr+Latn/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Puštajte u grupi"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Nema dostupnih informacija"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Nije dostupan nijedan uređaj"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Nismo pronašli uređaje. Uverite se da su vaš uređaj i uređaj za prebacivanje na istoj WiFi mreži."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Uverite se da su uređaj i uređaj za prebacivanje na istoj WiFi mreži."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Gotovo"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-be/strings.xml b/mediarouter/mediarouter/src/main/res/values-be/strings.xml
index cdbeea5..6cb1b82 100644
--- a/mediarouter/mediarouter/src/main/res/values-be/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-be/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Прайграць на групе прылад"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Інфармацыя адсутнічае"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Няма даступных прылад"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Не ўдалося знайсці прыладу. Пераканайцеся, што ваша прылада і прылада для трансляцыі падключаны да адной і той жа сеткі Wi-Fi."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Пераканайцеся, што ваша прылада і прылада для трансляцыі падключаны да адной і той жа сеткі Wi-Fi."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Гатова"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-bg/strings.xml b/mediarouter/mediarouter/src/main/res/values-bg/strings.xml
index 1d7862c..fd34fe6 100644
--- a/mediarouter/mediarouter/src/main/res/values-bg/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-bg/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Възпроизвеждане в група"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Няма налична информация"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Няма налични устройства"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Не могат да се намерят устройства. Уверете се, че устройството ви и устройството Cast са в една и съща Wi-Fi мрежа, и опитайте отново."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Уверете се, че устройството ви и устройството Cast са в една и съща Wi-Fi мрежа."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Готово"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-bn/strings.xml b/mediarouter/mediarouter/src/main/res/values-bn/strings.xml
index b494578..3fffb29 100644
--- a/mediarouter/mediarouter/src/main/res/values-bn/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-bn/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"গ্রুপে প্লে করুন"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"কোনও তথ্য নেই"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"কোনও ডিভাইস উপলভ্য নেই"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"ডিভাইস খুঁজে না পেলে, আপনার ডিভাইস ও কাস্ট ডিভাইস একই ওয়াই-ফাই নেটওয়ার্কে আছে কিনা তা ভালভাবে দেখে নিয়ে আবার চেষ্টা করুন।"</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"আপনার ডিভাইস ও কাস্ট ডিভাইস একই ওয়াই-ফাই নেটওয়ার্কে রয়েছে কিনা তা ভালভাবে দেখে নিন।"</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"হয়ে গেছে"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-bs/strings.xml b/mediarouter/mediarouter/src/main/res/values-bs/strings.xml
index 212a482..9c1b595 100644
--- a/mediarouter/mediarouter/src/main/res/values-bs/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-bs/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Reproduciranje u grupi"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Nema dostupnih informacija"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Nema dostupnih uređaja"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Nije moguće pronaći uređaje. Provjerite jesu li vaš uređaj i uređaj za emitiranje na istoj WiFi mreži i pokušajte ponovo."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Provjerite jesu li vaš uređaj i uređaj za emitiranje na istoj WiFi mreži."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Gotovo"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-ca/strings.xml b/mediarouter/mediarouter/src/main/res/values-ca/strings.xml
index 86a8f3e..64b425b 100644
--- a/mediarouter/mediarouter/src/main/res/values-ca/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-ca/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Reprodueix en un grup"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"No hi ha informació disponible"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"No hi ha cap dispositiu disponible"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"No es poden trobar els dispositius. Assegura\'t que el teu dispositiu i el dispositiu d\'emissió estiguin connectats a la mateixa xarxa Wi‐Fi i torna-ho a provar."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Comprova que el teu dispositiu i el dispositiu d\'emissió estiguin connectats a la mateixa xarxa Wi‐Fi."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Fet"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-cs/strings.xml b/mediarouter/mediarouter/src/main/res/values-cs/strings.xml
index 367b916..e90c215 100644
--- a/mediarouter/mediarouter/src/main/res/values-cs/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-cs/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Přehrávání ve skupině"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Nejsou k dispozici žádné informace"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Nejsou k dispozici žádná zařízení"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Zařízení se nepodařilo najít. Zařízení a streamovací zařízení musí být připojeny ke stejné síti Wi-Fi. Zkuste to znovu."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Zařízení a streamovací zařízení musí být připojeny ke stejné síti Wi-Fi."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Hotovo"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-da/strings.xml b/mediarouter/mediarouter/src/main/res/values-da/strings.xml
index de4ce91..33ff77c 100644
--- a/mediarouter/mediarouter/src/main/res/values-da/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-da/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Afspil på en gruppe"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Der er ingen tilgængelige oplysninger"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Der er ingen tilgængelige enheder"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Det var ikke muligt at finde enhederne. Sørg for, at din enhed og Cast-enheden har forbindelse til det samme Wi-Fi-netværk, og prøv igen."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Sørg for, at din enhed og Cast-enheden har forbindelse til det samme Wi-Fi-netværk."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Udfør"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-de/strings.xml b/mediarouter/mediarouter/src/main/res/values-de/strings.xml
index 5a2f44c..81687cc 100644
--- a/mediarouter/mediarouter/src/main/res/values-de/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-de/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Auf einem Gruppengerät abspielen"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Keine Informationen verfügbar"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Keine Geräte verfügbar"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Geräte konnten nicht gefunden werden. Prüfe, ob dein Gerät und das Übertragungsgerät mit demselben WLAN verbunden sind."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Achte darauf, dass dein Gerät und das Übertragungsgerät mit demselben WLAN verbunden sind."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Fertig"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-el/strings.xml b/mediarouter/mediarouter/src/main/res/values-el/strings.xml
index aa0ada2..a7c1961 100644
--- a/mediarouter/mediarouter/src/main/res/values-el/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-el/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Αναπαραγωγή σε κάποια ομάδα"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Δεν υπάρχουν διαθέσιμες πληροφορίες"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Δεν υπάρχουν διαθέσιμες συσκευές"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Δεν είναι δυνατή η εύρεση συσκευών. Βεβαιωθείτε ότι η συσκευή σας και η συσκευή μετάδοσης είναι στο ίδιο δίκτυο Wi-Fi και δοκιμάστε ξανά."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Βεβαιωθείτε ότι η συσκευή σας και η συσκευή μετάδοσης είναι στο ίδιο δίκτυο Wi-Fi."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Τέλος"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-en-rAU/strings.xml b/mediarouter/mediarouter/src/main/res/values-en-rAU/strings.xml
index 5f58f94..2e5a3d7 100644
--- a/mediarouter/mediarouter/src/main/res/values-en-rAU/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-en-rAU/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Play on a group"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"No info available"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"No devices available"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Unable to find devices, make sure that your device and the cast device are on the same Wi-Fi network and try again."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Make sure that your device and the cast device are on the same Wi-Fi network."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Done"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-en-rCA/strings.xml b/mediarouter/mediarouter/src/main/res/values-en-rCA/strings.xml
index 68cb38b..2e5a3d7 100644
--- a/mediarouter/mediarouter/src/main/res/values-en-rCA/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-en-rCA/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Play on a group"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"No info available"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"No devices available"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Unable to find devices, make sure your device and the Cast device are on the same Wi-Fi network and try again."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Make sure your device and the Cast device are on the same Wi-Fi network."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Done"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-en-rGB/strings.xml b/mediarouter/mediarouter/src/main/res/values-en-rGB/strings.xml
index 5f58f94..2e5a3d7 100644
--- a/mediarouter/mediarouter/src/main/res/values-en-rGB/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-en-rGB/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Play on a group"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"No info available"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"No devices available"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Unable to find devices, make sure that your device and the cast device are on the same Wi-Fi network and try again."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Make sure that your device and the cast device are on the same Wi-Fi network."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Done"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-en-rIN/strings.xml b/mediarouter/mediarouter/src/main/res/values-en-rIN/strings.xml
index 5f58f94..2e5a3d7 100644
--- a/mediarouter/mediarouter/src/main/res/values-en-rIN/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-en-rIN/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Play on a group"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"No info available"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"No devices available"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Unable to find devices, make sure that your device and the cast device are on the same Wi-Fi network and try again."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Make sure that your device and the cast device are on the same Wi-Fi network."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Done"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-en-rXC/strings.xml b/mediarouter/mediarouter/src/main/res/values-en-rXC/strings.xml
index 4d254b2..a95c66a 100644
--- a/mediarouter/mediarouter/src/main/res/values-en-rXC/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-en-rXC/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‎‏‏‎‏‏‎‎‏‎‎‎‎‎‎‏‎‎‎‎‎‏‏‎‎‎‎‏‎‏‎‎‏‎‎‎‏‎‏‎‎‏‏‏‏‎‏‏‏‏‎‎‎Play on a group‎‏‎‎‏‎"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‏‏‏‎‏‎‎‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‏‏‎‎‎‏‏‏‎‎‎‏‏‎‎‎‎‏‎‏‏‎No info available‎‏‎‎‏‎"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‏‏‎‎‏‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‎‏‏‎‏‎‎‎‏‏‎‎‏‏‎‏‎‎‎‎‎‏‏‎‎‎‎‎No devices available‎‏‎‎‏‎"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‎‏‏‎‎‏‏‎‏‏‎‎‎‎‏‏‎‎‏‎‎‏‎‏‎‏‏‏‎‏‎‏‏‏‎‏‎‎‏‏‏‎‎‎‎‏‏‎‎‎‎‏‏‏‎Unable to find devices, make sure your device and the Cast device are on the same Wi-Fi network and try again.‎‏‎‎‏‎"</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‏‏‎‎‏‎‏‏‎‎‎‎‎‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‎‏‏‎‏‏‎‎‎‏‎‏‏‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎‏‎‎‏‎Make sure your device and the Cast device are on the same Wi-Fi network.‎‏‎‎‏‎"</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‎‎‎‏‏‎‎‏‏‏‎‎‎‏‏‎‎‎‎‎‎‏‎‏‏‏‎‏‎‎‎‎‏‏‎‏‎‎‎‎‏‎‏‎‎‎‏‎‎‏‏‎Done‎‏‎‎‏‎"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-es-rUS/strings.xml b/mediarouter/mediarouter/src/main/res/values-es-rUS/strings.xml
index 939e6ba..939dfd8 100644
--- a/mediarouter/mediarouter/src/main/res/values-es-rUS/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-es-rUS/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Reproducir en un grupo"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Sin información disponible"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"No hay dispositivos disponibles"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"No se encontraron dispositivos. Asegúrate de que tu dispositivo y el dispositivo de transmisión están conectados a la misma red Wi-Fi, y vuelve a intentarlo."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Asegúrate de que tu dispositivo y el dispositivo de transmisión están conectados a la misma red Wi-Fi."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Listo"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-es/strings.xml b/mediarouter/mediarouter/src/main/res/values-es/strings.xml
index 4aa769b..fa76eb1 100644
--- a/mediarouter/mediarouter/src/main/res/values-es/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-es/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Reproducir en un grupo"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"No hay información disponible"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"No hay dispositivos disponibles"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"No se han podido encontrar los dispositivos. Comprueba que tu dispositivo y el dispositivo de emisión estén conectados a la misma red Wi-Fi y vuelve a intentarlo."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Comprueba que tu dispositivo y el dispositivo de emisión estén conectados a la misma red Wi‑Fi."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Hecho"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-et/strings.xml b/mediarouter/mediarouter/src/main/res/values-et/strings.xml
index 153797f..5e931bc 100644
--- a/mediarouter/mediarouter/src/main/res/values-et/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-et/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Grupis esitamine"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Teave puudub"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Ühtegi seadet pole saadaval"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Seadmeid ei õnnestu leida. Veenduge, et teie seade ja ülekandeseade oleksid samas WiFi-võrgus, ja proovige uuesti."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Veenduge, et teie seade ja ülekandeseade oleksid samas WiFi-võrgus."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Valmis"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-eu/strings.xml b/mediarouter/mediarouter/src/main/res/values-eu/strings.xml
index 64eb18b..028fe89 100644
--- a/mediarouter/mediarouter/src/main/res/values-eu/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-eu/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Erreproduzitu talde batean"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Ez dago informaziorik"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Ez dago gailurik"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Ezin dira aurkitu gailuak. Ziurtatu gailua eta igorpen-gailua wifi-sare berean daudela. Ondoren, saiatu berriro."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Ziurtatu gailua eta igorpen-gailua wifi-sare berean daudela."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Eginda"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-fa/strings.xml b/mediarouter/mediarouter/src/main/res/values-fa/strings.xml
index 538d9f6..70cdbf1 100644
--- a/mediarouter/mediarouter/src/main/res/values-fa/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-fa/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"بازی در گروه"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"اطلاعاتی در دسترس نیست"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"دستگاهی موجود نیست"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"‏دستگاه‌ها پیدا نشدند؛ مطمئن شوید دستگاهتان و «دستگاه پخش» به یک شبکه Wi-Fi متصل باشند و دوباره امتحان کنید."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"‏مطمئن شوید دستگاهتان و «دستگاه پخش» به یک شبکه Wi-Fi متصل باشند."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"تمام"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-fi/strings.xml b/mediarouter/mediarouter/src/main/res/values-fi/strings.xml
index 92f367b..b76fa27 100644
--- a/mediarouter/mediarouter/src/main/res/values-fi/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-fi/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Toista ryhmässä"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Ei tietoja saatavilla"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Ei laitteita käytettävissä"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Laitteita ei löydy. Varmista, että laite ja striimauslaite ovat yhteydessä samaan Wi-Fi-verkkoon, ja yritä uudelleen."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Varmista, että laite ja striimauslaite ovat yhteydessä samaan Wi-Fi-verkkoon."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Valmis"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-fr-rCA/strings.xml b/mediarouter/mediarouter/src/main/res/values-fr-rCA/strings.xml
index 5a907b4..0802269 100644
--- a/mediarouter/mediarouter/src/main/res/values-fr-rCA/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-fr-rCA/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Faire jouer sur un groupe d\'appareils"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Aucune donnée trouvée"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Aucun appareil à proximité"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Impossible de trouver les appareils. Assurez-vous que votre appareil et l\'appareil de diffusion sont connectés au même réseau Wi-Fi et réessayez."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Assurez-vous que votre appareil et l\'appareil de diffusion sont connectés au même réseau Wi-Fi."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"OK"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-fr/strings.xml b/mediarouter/mediarouter/src/main/res/values-fr/strings.xml
index e017eb6..2d206ef 100644
--- a/mediarouter/mediarouter/src/main/res/values-fr/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-fr/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Lire sur un groupe d\'appareils"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Aucune information disponible"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Aucun appareil disponible"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Appareils introuvables. Assurez-vous que votre appareil et l\'appareil Cast sont connectés au même réseau Wi-Fi, puis réessayez."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Assurez-vous que votre appareil et l\'appareil Cast sont connectés au même réseau Wi-Fi."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"OK"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-gl/strings.xml b/mediarouter/mediarouter/src/main/res/values-gl/strings.xml
index 22b00ed..32b85a5 100644
--- a/mediarouter/mediarouter/src/main/res/values-gl/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-gl/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Reproducir nun grupo"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Non hai información dispoñible"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Non hai dispositivos dispoñibles"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Se non dás atopado os dispositivos, asegúrate de que o teu dispositivo e o de emisión estean na mesma rede wifi antes de tentalo de novo."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Asegúrate de que o teu dispositivo e o de emisión estean na mesma rede wifi."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Feito"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-gu/strings.xml b/mediarouter/mediarouter/src/main/res/values-gu/strings.xml
index adb67b5..fa11d3aa 100644
--- a/mediarouter/mediarouter/src/main/res/values-gu/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-gu/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"જૂથમાં રમો"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"કોઈ માહિતી ઉપલબ્ધ નથી"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"કોઈ ડિવાઇસ ઉપલબ્ધ નથી"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"ડિવાઇસ શોધી ન શકતા હો તો ખાતરી કરો કે તમારા ડિવાઇસ અને કાસ્ટ કરી શકતા ડિવાઇસને એક જ વાઇ-ફાઇ નેટવર્ક સાથે કનેક્ટ કર્યા હોય અને ફરી પ્રયાસ કરો."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"ખાતરી કરો કે તમારા ડિવાઇસ અને કાસ્ટ કરી શકતા ડિવાઇસને એક જ વાઇ-ફાઇ નેટવર્ક સાથે કનેક્ટ કર્યા હોય."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"થઈ ગયું"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-hi/strings.xml b/mediarouter/mediarouter/src/main/res/values-hi/strings.xml
index 3e79783..7b0245c 100644
--- a/mediarouter/mediarouter/src/main/res/values-hi/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-hi/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"समूह में खेलें"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"कोई जानकारी मौजूद नहीं है"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"कोई डिवाइस मौजूद नहीं है"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"डिवाइस नहीं मिल रहे हैं. पक्का करें कि आपका डिवाइस उसी वाई-फ़ाई नेटवर्क से कनेक्ट किया गया हो जिससे कास्ट डिवाइस को कनेक्ट किया गया है और फिर से कोशिश करें."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"पक्का करें कि आपका डिवाइस उसी वाई-फ़ाई नेटवर्क से कनेक्ट किया गया हो जिससे कास्ट डिवाइस को कनेक्ट किया गया है."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"हो गया"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-hr/strings.xml b/mediarouter/mediarouter/src/main/res/values-hr/strings.xml
index 249c298..2abdda7 100644
--- a/mediarouter/mediarouter/src/main/res/values-hr/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-hr/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Reprodukcija u grupi"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Informacije nisu dostupne"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Nema dostupnih uređaja"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Uređaji nisu pronađeni, provjerite jesu li vaš uređaj i uređaj za emitiranje na istoj Wi-Fi mreži i pokušajte ponovo."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Provjerite jesu li vaš uređaj i uređaj za emitiranje na istoj Wi-Fi mreži."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Gotovo"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-hu/strings.xml b/mediarouter/mediarouter/src/main/res/values-hu/strings.xml
index d19ec1c..b11e49f 100644
--- a/mediarouter/mediarouter/src/main/res/values-hu/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-hu/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Lejátszás eszközcsoportban"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Nincs információ"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Nincs rendelkezésre álló eszköz"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Nem találhatók eszközök, győződjön meg arról, hogy az eszköz és a Cast-eszköz ugyanazon a Wi-Fi-hálózaton van, majd próbálja újra."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Győződjön meg arról, hogy az eszköz és a Cast-eszköz ugyanazon a Wi-Fi-hálózaton van."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Kész"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-hy/strings.xml b/mediarouter/mediarouter/src/main/res/values-hy/strings.xml
index 997de42..88103d5 100644
--- a/mediarouter/mediarouter/src/main/res/values-hy/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-hy/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Նվագարկեք սարքերի խմբում"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Հասանելի տեղեկություններ չկան"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Հասանելի սարքեր չկան"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Չհաջողվեց սարքեր գտնել։ Համոզվեք, որ ձեր սարքը և Google Cast սարքը նույն Wi-Fi ցանցում են, և նորից փորձեք։"</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Համոզվեք, որ ձեր սարքը և Google Cast սարքը նույն Wi-Fi ցանցում են։"</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Պատրաստ է"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-in/strings.xml b/mediarouter/mediarouter/src/main/res/values-in/strings.xml
index 15d261a..39eb086 100644
--- a/mediarouter/mediarouter/src/main/res/values-in/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-in/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Putar di grup"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Info tidak tersedia"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Perangkat tidak tersedia"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Tidak dapat menemukan perangkat, pastikan perangkat Anda dan perangkat Transmisi berada pada jaringan Wi-Fi yang sama, lalu coba lagi."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Pastikan perangkat Anda dan perangkat Transmisi berada pada jaringan Wi-Fi yang sama."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Selesai"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-is/strings.xml b/mediarouter/mediarouter/src/main/res/values-is/strings.xml
index aa6cc3c..31a1da6 100644
--- a/mediarouter/mediarouter/src/main/res/values-is/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-is/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Spila í hóp"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Engar upplýsingar í boði"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Engin tæki í boði"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Tæki finnast ekki. Gakktu úr skugga um að tækið þitt og útsendingartækið séu tengd sama WiFi-neti."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Gakktu úr skugga um að tækið þitt og útsendingartækið séu tengd sama WiFi-neti."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Lokið"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-it/strings.xml b/mediarouter/mediarouter/src/main/res/values-it/strings.xml
index 028f6b7..a192988 100644
--- a/mediarouter/mediarouter/src/main/res/values-it/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-it/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Riproduci su un gruppo"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Nessuna informazione disponibile"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Nessun dispositivo disponibile"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Impossibile trovare dispositivi, assicurati che il dispositivo e il dispositivo di trasmissione siano sulla stessa rete Wi-Fi e riprova."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Assicurati che il tuo dispositivo e quello di trasmissione siano collegati alla stessa rete Wi-Fi."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Fine"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-iw/strings.xml b/mediarouter/mediarouter/src/main/res/values-iw/strings.xml
index b8d39d2..6cc75c1 100644
--- a/mediarouter/mediarouter/src/main/res/values-iw/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-iw/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"הפעלה בקבוצה"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"אין מידע זמין"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"אין מכשירים זמינים"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"‏המכשירים לא נמצאו, צריך לוודא שהמכשיר שלך ומכשיר ה-CAST מחוברים לאותה רשת Wi-Fi ולנסות שוב."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"‏יש לוודא שהמכשיר שלך ומכשיר ה-CAST מחוברים לאותה רשת Wi-Fi."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"סיום"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-ja/strings.xml b/mediarouter/mediarouter/src/main/res/values-ja/strings.xml
index 1611cb2..2633af8 100644
--- a/mediarouter/mediarouter/src/main/res/values-ja/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-ja/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"グループで再生"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"情報がありません"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"利用可能なデバイスがありません"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"デバイスが見つかりませんでした。お使いのデバイスとキャスト デバイスが同じ Wi-Fi ネットワークに接続されていることを確認して、もう一度お試しください。"</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"お使いのデバイスとキャスト デバイスが同じ Wi-Fi ネットワークに接続されていることを確認してください。"</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"完了"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-ka/strings.xml b/mediarouter/mediarouter/src/main/res/values-ka/strings.xml
index 114665f..8c5785e 100644
--- a/mediarouter/mediarouter/src/main/res/values-ka/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-ka/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"ჯგუფში დაკვრა"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"ინფორმაცია მიუწვდომელია"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"ხელმისაწვდომი მოწყობილობები არ არის"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"მოწყობილობების პოვნა ვერ ხერხდება — დარწმუნდით, რომ თქვენი და გადაცემის მოწყობილობა ერთსა და იმავე Wi-Fi ქსელთანაა დაკავშირებული და სცადეთ ხელახლა."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"დარწმუნდით, რომ თქვენი და გადაცემის მოწყობილობა ერთსა და იმავე Wi-Fi ქსელთანაა დაკავშირებული."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"მზადაა"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-kk/strings.xml b/mediarouter/mediarouter/src/main/res/values-kk/strings.xml
index c385983..9289e01 100644
--- a/mediarouter/mediarouter/src/main/res/values-kk/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-kk/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Топта ойнату"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Ешқандай ақпарат жоқ"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Ешқандай құрылғы табылмады"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Ешқандай құрылғы табылмай тұр. Құрылғыңыз бен трансляциялау құрылғысы бір Wi-Fi желісіне жалғанғанын тексеріңіз де қайталап көріңіз."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Құрылғыңыз бен трансляциялау құрылғысы бір Wi-Fi желісіне жалғанғанын тексеріңіз."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Дайын"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-km/strings.xml b/mediarouter/mediarouter/src/main/res/values-km/strings.xml
index 8c3e141..3e60051 100644
--- a/mediarouter/mediarouter/src/main/res/values-km/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-km/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"លេងនៅ​លើក្រុម"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"មិនមានព័ត៌មានទេ"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"មិន​មាន​ឧបករណ៍​ទេ"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"រកមិនឃើញឧបករណ៍ទេ សូមប្រាកដថា ឧបករណ៍របស់អ្នក និងឧបករណ៍បញ្ជូនស្ថិតលើបណ្ដាញ Wi-Fi តែមួយ រួចព្យាយាមម្ដងទៀត។"</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"សូមប្រាកដថា ឧបករណ៍របស់អ្នក និងឧបករណ៍បញ្ជូន​ស្ថិតលើបណ្តាញ Wi-Fi តែមួយ។"</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"រួចរាល់"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-kn/strings.xml b/mediarouter/mediarouter/src/main/res/values-kn/strings.xml
index 484924c9..02f32b3 100644
--- a/mediarouter/mediarouter/src/main/res/values-kn/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-kn/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"ಗುಂಪಿನಲ್ಲಿ ಪ್ಲೇ ಮಾಡಿ"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"ಯಾವುದೇ ಮಾಹಿತಿ ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"ಯಾವುದೇ ಸಾಧನಗಳು ಲಭ್ಯವಿಲ್ಲ"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"ಸಾಧನಗಳನ್ನು ಹುಡುಕಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ, ನಿಮ್ಮ ಸಾಧನ ಮತ್ತು ಬಿತ್ತರಿಸುವ ಸಾಧನವು ಒಂದೇ ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್‌ನಲ್ಲಿದೆಯೇ ಎಂಬುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ ಹಾಗೂ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"ನಿಮ್ಮ ಸಾಧನ ಮತ್ತು ಬಿತ್ತರಿಸುವ ಸಾಧನವು ಒಂದೇ ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್‌ನಲ್ಲಿರುವುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"ಮುಗಿದಿದೆ"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-ko/strings.xml b/mediarouter/mediarouter/src/main/res/values-ko/strings.xml
index 7c49342..99a6b3c 100644
--- a/mediarouter/mediarouter/src/main/res/values-ko/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-ko/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"그룹에서 재생"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"사용할 수 있는 정보 없음"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"사용 가능한 기기 없음"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"기기를 찾을 수 없습니다. 기기와 Cast 기기가 동일한 Wi-Fi 네트워크에 연결되어 있는지 확인 후 다시 시도하세요."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"기기와 Cast 기기가 동일한 Wi-Fi 네트워크에 연결되어 있는지 확인하세요."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"완료"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-ky/strings.xml b/mediarouter/mediarouter/src/main/res/values-ky/strings.xml
index d47a45d..33d626b 100644
--- a/mediarouter/mediarouter/src/main/res/values-ky/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-ky/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Топто ойнотуу"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Эч маалымат жок"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Жеткиликтүү түзмөктөр жок"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Түзмөктөр табылбай жатат. Түзмөгүңүз менен тышкы экранга чыгаруучу түзмөк бир Wi-Fi тармагына туташканын текшерип, кайталап көрүңүз."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Түзмөгүңүз менен тышкы экранга чыгаруучу түзмөк бир Wi-Fi тармагына туташып турушу керек."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Бүттү"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-lo/strings.xml b/mediarouter/mediarouter/src/main/res/values-lo/strings.xml
index f666704..6ee278f 100644
--- a/mediarouter/mediarouter/src/main/res/values-lo/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-lo/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"ຫຼິ້ນຢູ່ກຸ່ມ"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"ບໍ່ມີຂໍ້ມູນ"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"ບໍ່ມີອຸປະກອນທີ່ສາມາດໃຊ້ໄດ້"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"ບໍ່ພົບອຸປະກອນ, ກວດສອບວ່າອຸປະກອນຂອງທ່ານ ແລະ ອຸປະກອນ Chromecast ໃຊ້ເຄືອຂ່າຍ Wi-Fi ດຽວກັນ ແລ້ວລອງໃໝ່."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"ກວດສອບວ່າອຸປະກອນຂອງທ່ານ ແລະ ອຸປະກອນ Chromecast ໃຊ້ເຄືອຂ່າຍ Wi-Fi ດຽວກັນ."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"ແລ້ວໆ"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-lt/strings.xml b/mediarouter/mediarouter/src/main/res/values-lt/strings.xml
index 4acffae..c1dd51e 100644
--- a/mediarouter/mediarouter/src/main/res/values-lt/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-lt/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Leidimas grupėje"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Nėra jokios informacijos"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Nėra jokių pasiekiamų įrenginių"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Nepavyko rasti įrenginių. Įsitikinkite, kad jūsų ir perdavimo įrenginiai prijungti prie to paties „Wi-Fi“ tinklo ir bandykite dar kartą."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Įsitikinkite, kad jūsų ir perdavimo įrenginiai prijungti prie to paties „Wi-Fi“ tinklo."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Atlikta"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-lv/strings.xml b/mediarouter/mediarouter/src/main/res/values-lv/strings.xml
index e24841c..fe6b05e 100644
--- a/mediarouter/mediarouter/src/main/res/values-lv/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-lv/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Atskaņošana grupā"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Nav informācijas"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Nav pieejamu ierīču"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Nevar atrast ierīces. Pārbaudiet, vai jūsu ierīce un apraides ierīce ir savienota ar vienu un to pašu Wi‑Fi tīklu, un mēģiniet vēlreiz."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Pārbaudiet, vai jūsu ierīce un apraides ierīce ir savienota ar vienu un to pašu Wi‑Fi tīklu."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Gatavs"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-mk/strings.xml b/mediarouter/mediarouter/src/main/res/values-mk/strings.xml
index db6ad85..cd3ad5b 100644
--- a/mediarouter/mediarouter/src/main/res/values-mk/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-mk/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Пуштете на група"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Нема достапни информации"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Нема достапни уреди"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Не може да се најдат уреди. Проверете дали вашиот уред и уредот со Cast се на истата Wi-Fi мрежа, па обидете се повторно."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Проверете дали вашиот уред и уредот со Cast се на истата Wi-Fi мрежа."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Готово"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-ml/strings.xml b/mediarouter/mediarouter/src/main/res/values-ml/strings.xml
index 98778c6..dfb85d4 100644
--- a/mediarouter/mediarouter/src/main/res/values-ml/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-ml/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"ഒരു ഗ്രൂപ്പിൽ പ്ലേ ചെയ്യുക"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"വിവരങ്ങളൊന്നും ലഭ്യമല്ല"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"ഉപകരണങ്ങളൊന്നും ലഭ്യമല്ല"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"ഉപകരണങ്ങൾ കണ്ടെത്താനായില്ല, നിങ്ങളുടെ ഉപകരണവും കാസ്‌റ്റ് ഉപകരണവും ഒരേ വെെഫെെ നെറ്റ്‌വർക്കിലാണ് ഉള്ളതെന്ന് ഉറപ്പാക്കി വീണ്ടും ശ്രമിക്കുക."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"നിങ്ങളുടെ ഉപകരണവും കാസ്‌റ്റ് ഉപകരണവും ഒരേ വെെഫെെ നെറ്റ്‌വർക്കിലാണ് ഉള്ളതെന്ന് ഉറപ്പാക്കുക."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"പൂർത്തിയായി"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-mn/strings.xml b/mediarouter/mediarouter/src/main/res/values-mn/strings.xml
index 7a5b367..83de22e 100644
--- a/mediarouter/mediarouter/src/main/res/values-mn/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-mn/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Бүлэгт тоглуулах"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Мэдээлэл алга"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Ямар ч боломжтой төхөөрөмж байхгүй"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Төхөөрөмжүүдийг олох боломжгүй. Таны төхөөрөмж болон дамжуулагч төхөөрөмж ижил Wi-Fi сүлжээнд холбогдсон эсэхийг шалгаад дахин оролдоно уу."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Таны төхөөрөмж болон дамжуулагч төхөөрөмж ижил Wi-Fi сүлжээнд холбогдсон эсэхийг шалгана уу."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Болсон"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-mr/strings.xml b/mediarouter/mediarouter/src/main/res/values-mr/strings.xml
index 4bec966..f0712411 100644
--- a/mediarouter/mediarouter/src/main/res/values-mr/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-mr/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"गटावर प्ले करा"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"कोणतीही माहिती उपलब्ध नाही"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"कोणतीही डिव्हाइस उपलब्ध नाहीत"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"डिव्हाइस शोधता आली नाहीत, तुमचे डिव्हाइस आणि कास्‍ट डिव्‍हाइस एकाच वाय-फाय नेटवर्कवर असल्याची खात्री करा आणि पुन्हा प्रयत्न करा."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"तुमचे डिव्हाइस आणि कास्‍ट डिव्‍हाइस एकाच वाय-फाय नेटवर्कवर असल्याची खात्री करा."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"पूर्ण झाले"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-ms/strings.xml b/mediarouter/mediarouter/src/main/res/values-ms/strings.xml
index 858660e..4e29378 100644
--- a/mediarouter/mediarouter/src/main/res/values-ms/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-ms/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Mainkan pada kumpulan"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Maklumat tidak tersedia"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Tiada peranti tersedia"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Tidak dapat menemukan peranti, pastikan peranti anda dan peranti Cast menggunakan rangkaian Wi-Fi yang sama dan cuba lagi."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Pastikan peranti anda dan peranti Cast menggunakan rangkaian Wi-Fi yang sama."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Selesai"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-my/strings.xml b/mediarouter/mediarouter/src/main/res/values-my/strings.xml
index ca1f5a9..3b3aba7 100644
--- a/mediarouter/mediarouter/src/main/res/values-my/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-my/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"အုပ်စုလိုက် ဖွင့်ခြင်း"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"အချက်အလက် မရရှိနိုင်ပါ"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"စက်များ မရနိုင်ပါ"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"စက်များ ရှာမတွေ့ပါ။ သင်၏စက်နှင့် ‘ကာစ်လုပ်နိုင်သည့် စက်’ တို့သည် Wi-Fi ကွန်ရက်တစ်ခုတည်းသို့ ချိတ်ဆက်ထားကြောင်း သေချာစေပြီးနောက် ထပ်စမ်းကြည့်ပါ။"</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"သင်၏စက်နှင့် ‘ကာစ်လုပ်နိုင်သည့် စက်’ တို့သည် Wi-Fi ကွန်ရက်တစ်ခုတည်းသို့ ချိတ်ဆက်ထားကြောင်း သေချာပါစေ။"</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"ပြီးပြီ"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-nb/strings.xml b/mediarouter/mediarouter/src/main/res/values-nb/strings.xml
index 9150f1c..27520d9 100644
--- a/mediarouter/mediarouter/src/main/res/values-nb/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-nb/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Spill i en gruppe"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Ingen informasjon er tilgjengelig"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Ingen enheter er tilgjengelige"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Finner ikke enheter. Sjekk at enheten og Cast-enheten er koblet til samme wifi-nettverk, og prøv på nytt."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Sjekk at enheten og Cast-enheten er koblet til samme wifi-nettverk."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Ferdig"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-ne/strings.xml b/mediarouter/mediarouter/src/main/res/values-ne/strings.xml
index 318b0a0..e7372d4 100644
--- a/mediarouter/mediarouter/src/main/res/values-ne/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-ne/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"कुनै समूहमा प्ले गर्नुहोस्"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"कुनै पनि जानकारी उपलब्ध छैन"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"कुनै पनि डिभाइस उपलब्ध छैन"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"डिभाइसहरू भेट्टाउन सकिएन। तपाईंको डिभाइस र कास्ट डिभाइस एउटै Wi-Fi नेटवर्कमा कनेक्ट गरिएका छन् भन्ने कुरा सुनिश्चित गर्नुहोस् र फेरि प्रयास गर्नुहोस्।"</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"तपाईंको डिभाइस र कास्ट डिभाइस एउटै Wi-Fi नेटवर्कमा कनेक्ट गरिएका छन् भन्ने कुरा सुनिश्चित गर्नुहोस्।"</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"सम्पन्न भयो"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-nl/strings.xml b/mediarouter/mediarouter/src/main/res/values-nl/strings.xml
index 2e54321..eb68ea9 100644
--- a/mediarouter/mediarouter/src/main/res/values-nl/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-nl/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Afspelen in een groep"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Geen informatie beschikbaar"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Geen apparaten beschikbaar"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Kan geen apparaten vinden. Zorg dat je apparaat en het cast-apparaat verbinding hebben met hetzelfde wifi-netwerk en probeer het opnieuw."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Zorg dat je apparaat en het cast-apparaat verbinding hebben met hetzelfde wifi-netwerk."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Klaar"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-or/strings.xml b/mediarouter/mediarouter/src/main/res/values-or/strings.xml
index a6d5692..5c963d7 100644
--- a/mediarouter/mediarouter/src/main/res/values-or/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-or/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"ଏକ ଗ୍ରୁପ୍‌ରେ ପ୍ଲେ କରନ୍ତୁ"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"କୌଣସି ସୂଚନା ଉପଲବ୍ଧ ନାହିଁ"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"କୌଣସି ଡିଭାଇସ ଉପଲବ୍ଧ ନାହିଁ"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"ଡିଭାଇସଗୁଡ଼ିକୁ ଖୋଜିବାରେ ଅସମର୍ଥ, ଆପଣଙ୍କ ଡିଭାଇସ ଏବଂ କାଷ୍ଟ ଡିଭାଇସ ସମାନ ୱାଇ-ଫାଇ ନେଟୱାର୍କରେ ଅଛି ବୋଲି ସୁନିଶ୍ଚିତ କରି ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"ଆପଣଙ୍କ ଡିଭାଇସ ଏବଂ କାଷ୍ଟ ଡିଭାଇସ ସମାନ ୱାଇ-ଫାଇ ନେଟୱାର୍କରେ ଅଛି ବୋଲି ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"ହୋଇଗଲା"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-pa/strings.xml b/mediarouter/mediarouter/src/main/res/values-pa/strings.xml
index bb647c9..e5e715b 100644
--- a/mediarouter/mediarouter/src/main/res/values-pa/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-pa/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"ਕਿਸੇ ਗਰੁੱਪ ਵਿੱਚ ਖੇਡੋ"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"ਕੋਈ ਜਾਣਕਾਰੀ ਉਪਲਬਧ ਨਹੀਂ"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"ਕੋਈ ਡੀਵਾਈਸ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"ਡੀਵਾਈਸਾਂ ਨੂੰ ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ, ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਅਤੇ ਕਾਸਟ ਡੀਵਾਈਸ ਇੱਕੋ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ \'ਤੇ ਹਨ ਅਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਅਤੇ ਕਾਸਟ ਡੀਵਾਈਸ ਇੱਕੋ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ \'ਤੇ ਹਨ।"</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"ਹੋ ਗਿਆ"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-pl/strings.xml b/mediarouter/mediarouter/src/main/res/values-pl/strings.xml
index 3463d58..25a280f 100644
--- a/mediarouter/mediarouter/src/main/res/values-pl/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-pl/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Odtwórz w grupie"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Brak informacji"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Brak dostępnych urządzeń"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Nie można znaleźć urządzeń. Upewnij się, że Twoje urządzenie oraz urządzenie przesyłające są w tej samej sieci Wi-Fi, i spróbuj ponownie."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Upewnij się, że Twoje urządzenie oraz urządzenie przesyłające są w tej samej sieci Wi-Fi."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Gotowe"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-pt-rBR/strings.xml b/mediarouter/mediarouter/src/main/res/values-pt-rBR/strings.xml
index ea1dfac..0dbea52 100644
--- a/mediarouter/mediarouter/src/main/res/values-pt-rBR/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-pt-rBR/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Reproduzir em um grupo"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Nenhuma informação disponível"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Nenhum dispositivo disponível"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Não foi possível encontrar dispositivos. Confira se o seu dispositivo e o de transmissão estão conectados à mesma rede Wi-Fi e tente de novo."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Confira se o seu dispositivo e o de transmissão estão conectados à mesma rede Wi-Fi."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Concluído"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-pt-rPT/strings.xml b/mediarouter/mediarouter/src/main/res/values-pt-rPT/strings.xml
index 5483924..0f72d38 100644
--- a/mediarouter/mediarouter/src/main/res/values-pt-rPT/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-pt-rPT/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Reproduzir num grupo"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Nenhuma informação disponível"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Nenhum dispositivo disponível"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Não foi possível encontrar dispositivos. Certifique-se de que o seu dispositivo e o dispositivo de transmissão estão ligados à mesma rede Wi-Fi e tente novamente."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Certifique-se de que o seu dispositivo e o dispositivo de transmissão estão ligados à mesma rede Wi-Fi."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Concluído"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-pt/strings.xml b/mediarouter/mediarouter/src/main/res/values-pt/strings.xml
index ea1dfac..0dbea52 100644
--- a/mediarouter/mediarouter/src/main/res/values-pt/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-pt/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Reproduzir em um grupo"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Nenhuma informação disponível"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Nenhum dispositivo disponível"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Não foi possível encontrar dispositivos. Confira se o seu dispositivo e o de transmissão estão conectados à mesma rede Wi-Fi e tente de novo."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Confira se o seu dispositivo e o de transmissão estão conectados à mesma rede Wi-Fi."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Concluído"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-ro/strings.xml b/mediarouter/mediarouter/src/main/res/values-ro/strings.xml
index b7ea8b2..7c9ec75 100644
--- a/mediarouter/mediarouter/src/main/res/values-ro/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-ro/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Redă într-un grup"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Nu sunt informații disponibile"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Nu sunt disponibile dispozitive"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Nu s-au găsit dispozitive. Asigură-te că dispozitivul tău și dispozitivul de proiecție sunt conectate la aceeași rețea Wi-Fi și încearcă din nou."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Asigură-te că dispozitivul tău și dispozitivul de proiecție sunt conectate la aceeași rețea Wi-Fi."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Gata"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-ru/strings.xml b/mediarouter/mediarouter/src/main/res/values-ru/strings.xml
index c6ec1fd..d9b549d 100644
--- a/mediarouter/mediarouter/src/main/res/values-ru/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-ru/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Воспроизведение в группе"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Данных нет"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Нет доступных устройств"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Не удается найти устройства. Убедитесь, что они подключены к одной и той же сети Wi-Fi."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Убедитесь, что это устройство и устройство для трансляции подключены к одной и той же сети Wi-Fi."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Готово"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-si/strings.xml b/mediarouter/mediarouter/src/main/res/values-si/strings.xml
index 830a8bd..be41018 100644
--- a/mediarouter/mediarouter/src/main/res/values-si/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-si/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"සමූහයක ධාවනය කරන්න"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"ලබා ගත හැකි තොරතුරු නොමැත"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"කිසිදු උපාංගයක් නොමැත"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"උපාංග සොයා ගැනීමට නොහැකි වේ, ඔබේ උපාංගය සහ Cast උපාංගය එකම Wi-Fi ජාලයක ඇති බව සහතික කර ගෙන නැවත උත්සාහ කරන්න."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"ඔබේ උපාංගය සහ Cast උපාංගය එකම Wi-Fi ජාලයක ඇති බව සහතික කර ගන්න."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"නිමයි"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-sk/strings.xml b/mediarouter/mediarouter/src/main/res/values-sk/strings.xml
index 4f96aa2..7c6c03b 100644
--- a/mediarouter/mediarouter/src/main/res/values-sk/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-sk/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Prehrávanie v skupine"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Nie sú k dispozícii žiadne informácie"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Nie sú k dispozícii žiadne zariadenia"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Zariadenia sa nedajú nájsť. Skontrolujte, či sú vaše zariadenie a zariadenie na prenos pripojené k rovnakej sieti Wi‑Fi, a skúste to znova."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Skontrolujte, či sú vaše zariadenie a zariadenie na prenos pripojené k rovnakej sieti Wi‑Fi."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Hotovo"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-sl/strings.xml b/mediarouter/mediarouter/src/main/res/values-sl/strings.xml
index 10732e6..b870841 100644
--- a/mediarouter/mediarouter/src/main/res/values-sl/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-sl/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Predvajanje v skupini"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Ni podatkov"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Nobena naprava ni na voljo"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Naprav ni mogoče najti. Prepričajte se, da sta vaša naprava in naprava za predvajanje povezani v isto omrežje Wi-Fi, in poskusite znova."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Prepričajte se, da sta vaša naprava in naprava za predvajanje povezani v isto omrežje Wi-Fi."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Končano"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-sq/strings.xml b/mediarouter/mediarouter/src/main/res/values-sq/strings.xml
index 15cee8a..22432da 100644
--- a/mediarouter/mediarouter/src/main/res/values-sq/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-sq/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Luaj në një grup"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Nuk jepet asnjë informacion"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Nuk ofrohet asnjë pajisje"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Pajisjet nuk mund të gjenden. Sigurohu që pajisja jote dhe pajisja e transmetimit me teknologjinë \"cast\" të jenë në të njëjtin rrjet Wi-Fi dhe provo përsëri."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Sigurohu që si pajisja jote ashtu edhe pajisja e transmetimit me teknologjinë \"cast\" të jenë në të njëjtin rrjet Wi-Fi."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"U krye"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-sr/strings.xml b/mediarouter/mediarouter/src/main/res/values-sr/strings.xml
index 6d72f70..feb426d 100644
--- a/mediarouter/mediarouter/src/main/res/values-sr/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-sr/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Пуштајте у групи"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Нема доступних информација"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Није доступан ниједан уређај"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Нисмо пронашли уређаје. Уверите се да су ваш уређај и уређај за пребацивање на истој WiFi мрежи."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Уверите се да су уређај и уређај за пребацивање на истој WiFi мрежи."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Готово"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-sv/strings.xml b/mediarouter/mediarouter/src/main/res/values-sv/strings.xml
index 9f26dc2..a8b44fa 100644
--- a/mediarouter/mediarouter/src/main/res/values-sv/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-sv/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Spela upp på en grupp enheter"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Det finns ingen tillgänglig information"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Inga tillgängliga enheter"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Det gick inte att hitta enheter. Kontrollera att din enhet och Cast-enheten är anslutna till samma wifi-nätverk och pröva igen."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Kontrollera att din enhet och Cast-enheten är anslutna till samma wifi-nätverk."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Klart"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-sw/strings.xml b/mediarouter/mediarouter/src/main/res/values-sw/strings.xml
index d1fac7e..2e7c75e 100644
--- a/mediarouter/mediarouter/src/main/res/values-sw/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-sw/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Cheza kwenye kikundi"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Hakuna maelezo yaliyopatikana"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Hakuna vifaa vilivyopatikana"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Imeshindwa kupata vifaa, hakikisha kifaa chako na Kifaa kinachotuma maudhui vimeunganishwa kwenye mtandao mmoja wa Wi-Fi."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Hakikisha kifaa chako na Kifaa kinachotuma maudhui vimeunganishwa kwenye mtandao mmoja wa Wi-Fi."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Nimemaliza"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-ta/strings.xml b/mediarouter/mediarouter/src/main/res/values-ta/strings.xml
index ee8cab7..2fde991 100644
--- a/mediarouter/mediarouter/src/main/res/values-ta/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-ta/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"குழுவில் இயக்கு"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"தகவல் எதுவுமில்லை"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"சாதனங்கள் இல்லை"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"சாதனங்களைக் கண்டறிய முடியவில்லை, உங்கள் சாதனமும் அனுப்பும் சாதனமும் ஒரே வைஃபை நெட்வொர்க்கில் இணைக்கப்பட்டிருப்பதை உறுதிசெய்து மீண்டும் முயலவும்."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"உங்கள் சாதனமும் அனுப்பும் சாதனமும் ஒரே வைஃபை நெட்வொர்க்கில் இணைக்கப்பட்டிருப்பதை உறுதிசெய்துகொள்ளவும்."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"முடிந்தது"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-te/strings.xml b/mediarouter/mediarouter/src/main/res/values-te/strings.xml
index e2c79ed..7622a4c 100644
--- a/mediarouter/mediarouter/src/main/res/values-te/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-te/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"గ్రూప్‌లో ప్లే చేయండి"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"సమాచారం అందుబాటులో లేదు"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"పరికరాలు ఏవీ అందుబాటులో లేవు"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"పరికరాలను కనుగొనడం సాధ్యపడలేదు, మీ పరికరం, ప్రసార పరికరం ఒకే Wi-Fi నెట్‌వర్క్‌లో ఉన్నాయని నిర్ధారించుకుని, మళ్లీ ట్రై చేయండి."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"మీ పరికరం, ప్రసార పరికరం ఒకే Wi-Fi నెట్‌వర్క్‌లో ఉన్నాయని నిర్ధారించుకోండి."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"పూర్తయింది"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-th/strings.xml b/mediarouter/mediarouter/src/main/res/values-th/strings.xml
index 9738543..43390b7 100644
--- a/mediarouter/mediarouter/src/main/res/values-th/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-th/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"เล่นในกลุ่ม"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"ไม่มีข้อมูล"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"ไม่มีอุปกรณ์ที่ใช้ได้"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"หาอุปกรณ์ไม่พบ ตรวจสอบว่าอุปกรณ์ของคุณและอุปกรณ์แคสต์ใช้เครือข่าย Wi-Fi เดียวกันแล้วลองอีกครั้ง"</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"ตรวจสอบว่าอุปกรณ์ของคุณและอุปกรณ์แคสต์ใช้เครือข่าย Wi-Fi เดียวกัน"</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"เสร็จสิ้น"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-tl/strings.xml b/mediarouter/mediarouter/src/main/res/values-tl/strings.xml
index be497a3..e63231a 100644
--- a/mediarouter/mediarouter/src/main/res/values-tl/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-tl/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"I-play sa isang pangkat"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Walang available na impormasyon"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Walang available na device"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Hindi makahanap ng mga device, tiyaking nakakonekta sa iisang Wi-Fi network ang iyong device at ang Cast device at subukan ulit."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Tiyaking nakakonekta sa iisang Wi-Fi network ang iyong device at ang Cast device."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Tapos na"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-tr/strings.xml b/mediarouter/mediarouter/src/main/res/values-tr/strings.xml
index 3bc302e..c919e99 100644
--- a/mediarouter/mediarouter/src/main/res/values-tr/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-tr/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Bir grupta oynatın"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Bilgi yok"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Kullanılabilir cihaz yok"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Cihaz bulunamadı. Cihazınızın ve yayın cihazının aynı kablosuz ağa bağlı olduğundan emin olup tekrar deneyin."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Cihazınızın yayın cihazınızla aynı kablosuz ağa bağlı olduğundan emin olun."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Bitti"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-uk/strings.xml b/mediarouter/mediarouter/src/main/res/values-uk/strings.xml
index e997a99..a0656db 100644
--- a/mediarouter/mediarouter/src/main/res/values-uk/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-uk/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Увімкнути на групі пристроїв"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Немає інформації"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Немає доступних пристроїв"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Не вдається знайти пристрої. Переконайтеся, що ваш пристрій і пристрій для трансляції підключено до однієї мережі Wi-Fi, і повторіть спробу."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Переконайтеся, що ваш пристрій і пристрій для трансляції підключено до однієї мережі Wi-Fi."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Готово"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-ur/strings.xml b/mediarouter/mediarouter/src/main/res/values-ur/strings.xml
index a0b934d..f1e0370 100644
--- a/mediarouter/mediarouter/src/main/res/values-ur/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-ur/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"گروپ پر چلائیں"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"کوئی معلومات دستیاب نہیں"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"کوئی آلہ دستیاب نہیں ہے"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"‏آلات تلاش کرنے سے قاصر، یقینی بنائیں کہ آپ کا آلہ اور کاسٹ آلہ ایک ہی Wi-Fi نیٹ ورک پر ہیں اور دوبارہ کوشش کریں۔"</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"‏یقینی بنائیں کہ آپ کا آلہ اور کاسٹ آلہ ایک ہی Wi-Fi نیٹ ورک پر ہیں۔"</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"ہو گیا"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-uz/strings.xml b/mediarouter/mediarouter/src/main/res/values-uz/strings.xml
index 106568b..98732ad 100644
--- a/mediarouter/mediarouter/src/main/res/values-uz/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-uz/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Guruhda ijro qilish"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Hech narsa topilmadi"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Hech qanday qurilma topilmadi"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Qurilmalar topilmadi, qurilmangiz va translatsiya qurilmasi bir xil Wi-Fi tarmoqqa ulanganini tekshiring va qaytadan urining."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Qurilmangiz va translatsiya qurilmasi bir xil Wi-Fi tarmoqqa ulangan boʻlishi lozim."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Tayyor"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-vi/strings.xml b/mediarouter/mediarouter/src/main/res/values-vi/strings.xml
index 54ac79f..f937b8c 100644
--- a/mediarouter/mediarouter/src/main/res/values-vi/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-vi/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Phát trên nhóm"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Không có thông tin nào"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Không có thiết bị nào"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Không tìm thấy thiết bị, hãy đảm bảo thiết bị của bạn và Thiết bị truyền sử dụng cùng một mạng Wi-Fi."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Hãy đảm bảo thiết bị của bạn và Thiết bị truyền sử dụng cùng một mạng Wi-Fi."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Xong"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-zh-rCN/strings.xml b/mediarouter/mediarouter/src/main/res/values-zh-rCN/strings.xml
index e90a3d8..3155df2 100644
--- a/mediarouter/mediarouter/src/main/res/values-zh-rCN/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-zh-rCN/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"在一组设备上播放"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"没有任何相关信息"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"没有可用的设备"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"无法找到设备,确保您的设备和投放设备使用的是同一个 WLAN 网络,然后重试。"</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"确保您的设备和投放设备使用的是同一个 WLAN 网络。"</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"完成"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-zh-rHK/strings.xml b/mediarouter/mediarouter/src/main/res/values-zh-rHK/strings.xml
index c907ac9..e37af77 100644
--- a/mediarouter/mediarouter/src/main/res/values-zh-rHK/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-zh-rHK/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"在群組裝置中播放"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"沒有資料可以提供"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"沒有可用的裝置"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"找不到裝置。請確保你的裝置與投放裝置已連線至相同的 Wi-Fi 網絡,然後再試一次。"</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"請確保你的裝置與投放裝置已連線至相同的 Wi-Fi 網絡。"</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"完成"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-zh-rTW/strings.xml b/mediarouter/mediarouter/src/main/res/values-zh-rTW/strings.xml
index a4977fa..16cddde 100644
--- a/mediarouter/mediarouter/src/main/res/values-zh-rTW/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-zh-rTW/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"在群組上播放"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"沒有可用的資訊"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"找不到裝置"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"找不到裝置。請確認你的裝置和投放裝置已連上同一個 Wi-Fi 網路,然後再試一次。"</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"請確認你的裝置和投放裝置已連上同一個 Wi-Fi 網路。"</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"完成"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values-zu/strings.xml b/mediarouter/mediarouter/src/main/res/values-zu/strings.xml
index 5b03991..cc0b025 100644
--- a/mediarouter/mediarouter/src/main/res/values-zu/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values-zu/strings.xml
@@ -42,7 +42,4 @@
     <string name="mr_dialog_transferable_header" msgid="6068257520605505468">"Dlala eqenjini"</string>
     <string name="mr_cast_dialog_title_view_placeholder" msgid="2175930138959078155">"Alukho ulwazi olutholakalayo"</string>
     <string name="mr_chooser_zero_routes_found_title" msgid="5213435473397442608">"Ayikho idivayisi etholakalayo"</string>
-    <string name="mr_chooser_zero_routes_description" msgid="5123320430013505927">"Awukwazi ukuthola amadivayisi, qinisekisa ukuthi idivayisi yakho nedivayisi ye-Cast zikunethiwekhi efanayo ye-Wi-Fi bese uyazama futhi."</string>
-    <string name="mr_chooser_wifi_warning_description" msgid="337903053432238985">"Qinisekisa ukuthi idivayisi yakho Nedivayisi yabalingisi zikunethiwekhi efanayo ye-Wi-Fi."</string>
-    <string name="mr_chooser_done_button_label" msgid="7897288652928484627">"Kwenziwe"</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values/attrs.xml b/mediarouter/mediarouter/src/main/res/values/attrs.xml
index 3e6dbe0..f25789e 100644
--- a/mediarouter/mediarouter/src/main/res/values/attrs.xml
+++ b/mediarouter/mediarouter/src/main/res/values/attrs.xml
@@ -41,6 +41,7 @@
     <attr name="mediaRoutePauseDrawable" format="reference" />
     <attr name="mediaRouteStopDrawable" format="reference" />
     <attr name="mediaRouteAudioTrackDrawable" format="reference" />
+    <attr name="mediaRouteWifiIconDrawable" format="reference" />
     <attr name="mediaRouteDefaultIconDrawable" format="reference" />
     <attr name="mediaRouteTvIconDrawable" format="reference" />
     <attr name="mediaRouteSpeakerIconDrawable" format="reference" />
diff --git a/mediarouter/mediarouter/src/main/res/values/dimens.xml b/mediarouter/mediarouter/src/main/res/values/dimens.xml
index f03eced..16d1a6d 100644
--- a/mediarouter/mediarouter/src/main/res/values/dimens.xml
+++ b/mediarouter/mediarouter/src/main/res/values/dimens.xml
@@ -53,6 +53,9 @@
     <!-- Group list fade out animation duration. -->
     <integer name="mr_controller_volume_group_list_fade_out_duration_ms">200</integer>
 
+    <!-- Size of wifi icon. -->
+    <dimen name="mr_controller_wifi_icon_size">24dp</dimen>
+
     <!-- MediaRouteDynamicChooserDialog/MediaRouteDynamicControllerDialog's common dimensions. -->
     <eat-comment />
     <!-- Height of group volume item in dynamic group -->
diff --git a/mediarouter/mediarouter/src/main/res/values/strings.xml b/mediarouter/mediarouter/src/main/res/values/strings.xml
index 40d73e1..fa295bd 100644
--- a/mediarouter/mediarouter/src/main/res/values/strings.xml
+++ b/mediarouter/mediarouter/src/main/res/values/strings.xml
@@ -43,6 +43,9 @@
     <!-- Placeholder text to show when no devices have been found. [CHAR LIMIT=50] -->
     <string name="mr_chooser_searching">Finding devices</string>
 
+    <!-- Placeholder text to show when looking for devices. [CHAR LIMIT=50] -->
+    <string name="mr_chooser_looking_for_devices">Looking for devices...</string>
+
     <!-- Button to disconnect from a media route.  [CHAR LIMIT=30] -->
     <string name="mr_controller_disconnect">Disconnect</string>
 
@@ -98,12 +101,18 @@
     <!-- Title of the media route chooser dialog when zero routes have been found after searching. [CHAR_LIMIT=NONE] -->
     <string name="mr_chooser_zero_routes_found_title">No devices available</string>
 
-    <!-- Text displayed when no routes have been found after searching. [CHAR_LIMIT=NONE] -->
-    <string name="mr_chooser_zero_routes_description"><a href="https://support.google.com/chromecast/?p=trouble-finding-devices">Learn more</a> about how you can cast your content to other devices.</string>
-
     <!-- Text displayed to hint making sure device and cast device are connected to the same Wi-Fi. [CHAR_LIMIT=NONE] -->
-    <string name="mr_chooser_wifi_warning_description">Make sure your device and the Cast device are on the same Wi-Fi network. \n\n<a href="https://support.google.com/chromecast/?p=trouble-finding-devices">Learn more</a></string>
+    <string name="mr_chooser_wifi_warning_description">Make sure the other device is on the same Wi-Fi network as this %s</string>
 
-    <!-- The label of the Done button that closes the Cast media route chooser dialog when tapped. [CHAR_LIMIT=30] -->
-    <string name="mr_chooser_done_button_label">Done</string>
+    <!-- Text displayed to link the user to the support article. [CHAR_LIMIT=NONE] -->
+    <string name="mr_chooser_wifi_learn_more"><a href="https://support.google.com/chromecast/?p=trouble-finding-devices">Learn more</a></string>
+    <string name="ic_media_route_learn_more_accessibility">Learn how to cast</string>
+
+    <!-- Text displayed representing different form factors of devices. [CHAR_LIMIT=NONE] -->
+    <string name="mr_device_form_factor_phone">phone</string>
+    <string name="mr_device_form_factor_tablet">tablet</string>
+    <string name="mr_device_form_factor_tv">tv</string>
+    <string name="mr_device_form_factor_watch">watch</string>
+    <string name="mr_device_form_factor_car">car</string>
+    <string name="mr_device_form_factor_unknown">device</string>
 </resources>
diff --git a/mediarouter/mediarouter/src/main/res/values/themes.xml b/mediarouter/mediarouter/src/main/res/values/themes.xml
index b5af40f..f723381 100644
--- a/mediarouter/mediarouter/src/main/res/values/themes.xml
+++ b/mediarouter/mediarouter/src/main/res/values/themes.xml
@@ -27,6 +27,7 @@
         <item name="mediaRoutePauseDrawable">@drawable/mr_media_pause_dark</item>
         <item name="mediaRouteStopDrawable">@drawable/mr_media_stop_dark</item>
         <item name="mediaRouteAudioTrackDrawable">@drawable/mr_vol_type_audiotrack_dark</item>
+        <item name="mediaRouteWifiIconDrawable">@drawable/mr_wifi_icon_dark</item>
         <item name="mediaRouteDefaultIconDrawable">@drawable/ic_mr_button_disconnected_dark</item>
         <item name="mediaRouteTvIconDrawable">@drawable/ic_vol_type_tv_dark</item>
         <item name="mediaRouteSpeakerIconDrawable">@drawable/ic_vol_type_speaker_dark</item>
@@ -51,6 +52,7 @@
         <item name="mediaRoutePauseDrawable">@drawable/mr_media_pause_light</item>
         <item name="mediaRouteStopDrawable">@drawable/mr_media_stop_light</item>
         <item name="mediaRouteAudioTrackDrawable">@drawable/mr_vol_type_audiotrack_light</item>
+        <item name="mediaRouteWifiIconDrawable">@drawable/mr_wifi_icon_light</item>
         <item name="mediaRouteDefaultIconDrawable">@drawable/ic_mr_button_grey</item>
         <item name="mediaRouteTvIconDrawable">@drawable/ic_vol_type_tv_light</item>
         <item name="mediaRouteSpeakerIconDrawable">@drawable/ic_vol_type_speaker_light</item>