Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Show more graceful screens for "add network" flow

Browse Source 
- use TableLayout instead of RelativeLayout for
  wifi configuration to align each columns appropriately.
- split @id/type field into two fields in SetupWizard

Bug: 3403168
Change-Id: I37f2c60ce1b0473af7d20dee1775e9893d2abade
This commit is contained in:
Daisuke Miyakawa
2011-02-28 16:45:17 -08:00
parent b181ba1756
commit d1c22a1b56
5 changed files with 119 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
View File

@@ -505,12 +505,13 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
view.findViewById(R.id.ssid_layout).setVisibility(View.VISIBLE);
if (accessPointSecurity == AccessPoint.SECURITY_EAP) {
setPaddingVisibility(View.VISIBLE);
hideSoftwareKeyboard();
// In SetupWizard for XLarge screen, we don't have enough space for showing
// configurations needed for EAP. We instead disable the whole feature there and let
// users configure those networks after the setup.
if (view.findViewById(R.id.type).getVisibility() == View.VISIBLE) {
if (view.findViewById(R.id.type_ssid).getVisibility() == View.VISIBLE) {
view.findViewById(R.id.eap_not_supported_for_add_network)
.setVisibility(View.VISIBLE);
} else {
@@ -525,11 +526,26 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
return false;
}
mConnectButton.setVisibility(View.VISIBLE);
setPaddingVisibility(View.GONE);
// In "add network" flow, we'll see multiple initSecurityFields() calls with different
// accessPointSecurity variable. We want to show software keyboard conditionally everytime
// when this method is called.
if (mWifiConfig != null) {
if (accessPointSecurity == AccessPoint.SECURITY_PSK ||
accessPointSecurity == AccessPoint.SECURITY_WEP) {
mWifiConfig.requestFocusAndShowKeyboard(R.id.password);
} else {
mWifiConfig.requestFocusAndShowKeyboard(R.id.ssid);
}
}
// Let the caller init security fields.
return true;
}
/* package */ void onEapNetworkSelected() {
private void onEapNetworkSelected() {
mConnectButton.setVisibility(View.GONE);
mBackButton.setText(R.string.wifi_setup_back);
}