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

UI fix for wifi setup in xl

Browse Source 
- Show "connecting" and "connected" text
- Modify layout for "Add network"

Bug: 3347865
Change-Id: I9c9b33b9033e7fb4f885717f00507c1360400725
This commit is contained in:
Daisuke Miyakawa
2011-01-18 20:25:27 -08:00
parent b213d30d2c
commit a30013fad4
3 changed files with 69 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,6 +96,9 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
private Button mConnectButton;
private Button mBackButton;
private View mConnectingStatusLayout;
private TextView mConnectingStatusView;
// true when a user already pressed "Connect" button and waiting for connection.
// Also true when the device is already connected to a wifi network on launch.
private boolean mAfterConnectAction;
@@ -165,6 +168,9 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
mTopPadding = findViewById(R.id.top_padding);
mWifiConfigPadding = findViewById(R.id.wifi_config_padding);
mConnectingStatusLayout = findViewById(R.id.connecting_status_layout);
mConnectingStatusView = (TextView) findViewById(R.id.connecting_status);
// At first, Wifi module doesn't return SCANNING state (it's too early), so we manually
// show it.
showScanningStatus();
@@ -254,6 +260,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
mProgressBar.setProgress(2);
showConnectedTitle();
mConnectingStatusView.setText(R.string.wifi_setup_description_connected);
mConnectButton.setVisibility(View.GONE);
mAddNetworkButton.setVisibility(View.GONE);
mRefreshButton.setVisibility(View.GONE);
@@ -344,6 +351,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
mWifiSettings.pauseWifiScan();
findViewById(R.id.wifi_setup).setVisibility(View.GONE);
mConnectingStatusLayout.setVisibility(View.GONE);
final ViewGroup parent = (ViewGroup)findViewById(R.id.wifi_config_ui);
parent.setVisibility(View.VISIBLE);
parent.removeAllViews();
@@ -422,6 +430,14 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
typeView.setVisibility(View.GONE);
}
// TODO: investigate whether visibility handling above is needed. Now that we hide
// them completely when connecting, so we may not need to do so, though we probably
// need to show software keyboard conditionaly.
final ViewGroup parent = (ViewGroup)findViewById(R.id.wifi_config_ui);
parent.setVisibility(View.GONE);
mConnectingStatusLayout.setVisibility(View.VISIBLE);
mConnectingStatusView.setText(R.string.wifi_setup_description_connecting);
mHandler.removeCallbacks(mSkipButtonEnabler);
mSkipOrNextButton.setVisibility(View.VISIBLE);
mSkipOrNextButton.setEnabled(false);
@@ -456,6 +472,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
}
findViewById(R.id.wifi_setup).setVisibility(View.VISIBLE);
mConnectingStatusLayout.setVisibility(View.GONE);
final ViewGroup parent = (ViewGroup)findViewById(R.id.wifi_config_ui);
parent.removeAllViews();
parent.setVisibility(View.GONE);
@@ -523,6 +540,10 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
showEditingTitle();
}
final ViewGroup parent = (ViewGroup)findViewById(R.id.wifi_config_ui);
parent.setVisibility(View.VISIBLE);
mConnectingStatusLayout.setVisibility(View.GONE);
// Restore View status which was tweaked on connection.
final View wpsFieldView = findViewById(R.id.wps_fields);
if (wpsFieldView != null) {