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

Changed wifi status lines per UX consult

Browse Source 
Change-Id: I656fa2c5c52338b320796a919edb5018e7b68851
This commit is contained in:
Isaac Levy
2011-08-11 23:55:04 -07:00
parent 57f947342c
commit 8b2bf2e538
5 changed files with 176 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -158,10 +158,11 @@ public class WifiConfigController implements TextWatcher,
mView.findViewById(R.id.type_ssid).setVisibility(View.VISIBLE);
mView.findViewById(R.id.type_security).setVisibility(View.VISIBLE);
// We want custom layout. The content must be same as the other cases.
mSecuritySpinner.setAdapter(
new ArrayAdapter<String>(context, R.layout.wifi_setup_custom_list_item_1,
android.R.id.text1,
context.getResources().getStringArray(R.array.wifi_security)));
ArrayAdapter<String> adapter = new ArrayAdapter<String>(context,
R.layout.wifi_setup_custom_list_item_1, android.R.id.text1,
context.getResources().getStringArray(R.array.wifi_security_no_eap));
mSecuritySpinner.setAdapter(adapter);
} else {
mView.findViewById(R.id.type).setVisibility(View.VISIBLE);
}
@@ -181,8 +182,7 @@ public class WifiConfigController implements TextWatcher,
addRow(group, R.string.wifi_status, Summary.get(mConfigUi.getContext(), state));
}
String[] type = resources.getStringArray(R.array.wifi_security);
addRow(group, R.string.wifi_security, type[mAccessPoint.security]);
addRow(group, R.string.wifi_security, mAccessPoint.getSecurityString(false));
int level = mAccessPoint.getLevel();
if (level != -1) {