am 90dad640: am 8bce7c37: Merge "UI compliance for WifiSettings" into jb-mr2-dev

* commit '90dad6404c2810f9f4110ecec94000c84d7e456d':
  UI compliance for WifiSettings
This commit is contained in:
Maggie Benthall
2013-04-24 13:03:19 -07:00
committed by Android Git Automerger
2 changed files with 3 additions and 3 deletions

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