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

Commit 02717449 authored by Chong Zhang's avatar Chong Zhang Committed by Android (Google) Code Review
Browse files

Merge "wifi-display: change string to "In use" instead of "Busy""

parents 47d8a5f1 5e1367f6

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -1221,8 +1221,8 @@ 
    <string name="wifi_display_status_connected">Connected</string>

    <!-- Wifi Display settings. The status summary for available devices. [CHAR LIMIT=40] -->

    <string name="wifi_display_status_available">Available</string>

    <!-- Wifi Display settings. The status summary for busy devices. [CHAR LIMIT=40] -->

    <string name="wifi_display_status_busy">Busy</string>

    <!-- Wifi Display settings. The status summary for devices that's already in use. [CHAR LIMIT=40] -->

    <string name="wifi_display_status_in_use">In use</string>

    <!-- Wifi Display settings. Image description for device details button. This opens the screen to rename, unpair, etc. a single device. -->

    <string name="wifi_display_details">Display settings</string>

src/com/android/settings/wfd/WifiDisplaySettings.java

+2 −2
Original line number Diff line number Diff line
@@ -270,13 +270,13 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment { 
            for (WifiDisplay display : mWifiDisplayStatus.getAvailableDisplays()) {

                if (display.getDeviceAddress().equals(d.getDeviceAddress()) &&

                        !display.canConnect()) {

                    p.setSummary(R.string.wifi_display_status_busy);

                    p.setSummary(R.string.wifi_display_status_in_use);

                    p.setEnabled(false);

                    break;

                }

            }

        } else if (!paired && !d.canConnect()) {

            p.setSummary(R.string.wifi_display_status_busy);

            p.setSummary(R.string.wifi_display_status_in_use);

            p.setEnabled(false);

        }

        if (paired) {