PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI compliance for WifiSettings

Browse Source 
Rename and reword string that appears in WifiSettings when user is 
restricted from modifying the networks.

Bug: 8696370
Change-Id: I1945550c05163ebff9602e4ba8ba890fece61265
This commit is contained in:
Maggie Benthall
2013-04-23 15:03:22 -04:00
parent 73e396f8ff
commit 91c016de41
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -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]-->

2
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -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();