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

Commit 8bce7c37 authored by Maggie Benthall's avatar Maggie Benthall Committed by Android (Google) Code Review
Browse files

Merge "UI compliance for WifiSettings" into jb-mr2-dev

parents 243ecbe4 91c016de
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -1207,8 +1207,6 @@
    <string name="wifi_display_searching_for_devices">Searching\u2026</string>
    <!-- Wifi Display settings. Text that appears when scanning for devices is finished and no nearby device was found [CHAR LIMIT=40]-->
    <string name="wifi_display_no_devices_found">No nearby wireless displays were found.</string>
    <!-- Wifi Display settings. Text displayed when user has restriction DISALLOW_CONFIG_WIFI-->
    <string name="wifi_display_settings_empty_list_user_restricted">This user is not allowed to configure wireless networks.</string>
    <!-- Wifi Display settings. The sub heading for devices which have already been paired with this device. [CHAR LIMIT=40] -->
    <string name="wifi_display_paired_devices">Paired displays</string>
    <!-- Wifi Display settings. The sub heading for available devices during and after scanning. [CHAR LIMIT=40] -->
@@ -1347,6 +1345,8 @@
    <string name="wifi_empty_list_wifi_off">To see available networks, turn Wi\u2011Fi on.</string>
    <!-- Wi-Fi settings. text displayed when Wi-Fi is on and network list is empty [CHAR LIMIT=50]-->
    <string name="wifi_empty_list_wifi_on">Searching for Wi\u2011Fi networks\u2026</string>
    <!-- Wifi Settings. text displayed when user has restriction DISALLOW_CONFIG_WIFI [CHAR LIMIT=NONE]-->
    <string name="wifi_empty_list_user_restricted">You don\'t have permission to change the Wi\u2011Fi network.</string>
    <!-- Wi-Fi settings. title for setup other network button [CHAR LIMIT=35]-->
    <string name="wifi_other_network">Other network\u2026</string>
    <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
+1 −1
Original line number Diff line number Diff line
@@ -716,7 +716,7 @@ public class WifiSettings extends SettingsPreferenceFragment
        if (getActivity() == null) return;

        if (mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_WIFI)) {
            addMessagePreference(R.string.wifi_display_settings_empty_list_user_restricted);
            addMessagePreference(R.string.wifi_empty_list_user_restricted);
            return;
        }
        final int wifiState = mWifiManager.getWifiState();