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

Use different text in unsecured network.

Browse Source 
We don't show any config UI when network is unsecured, while
Previously we've shown "Enter network configuration" anyway.

Also stop showing network status on StatusText (above
AccessPoint). New network status often appears and instructions
are removed unexpectedly.

Bug: 3175016
Change-Id: I3aa288930a8643e178f7c3897b326b7e00964361
This commit is contained in:
Daisuke Miyakawa
2010-12-15 15:21:25 -08:00
parent eb99f2f3f4
commit 0333f74b9c
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -2984,6 +2984,10 @@ found in the list of installed applications.</string>
networks and the UI is showing one possible existing network.
Used in Wifi Setup. -->
<string name="wifi_setup_status_existing_network">Connect to existing network</string>
<!-- Message shown above available networks when a user clicked one of available
networks and the network doesn't require configuration (e.g. password)
Used in Wifi Setup with XL screen. [CHAR LIMIT=35] -->
<string name="wifi_setup_status_unsecured_network">Connect to unsecured network</string>
<!-- Message shown above available networks when a user clicked one of available
networks and the UI is prompting the user to edit the network configuration
if needed. Used in Wifi Setup with XL screen. [CHAR LIMIT=35] -->

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

@@ -265,7 +265,6 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
mProgressBar.setIndeterminate(false);
mProgressBar.setProgress(0);
mStatusText.setText(stateString);
mProgressText.setText(stateString);
mAddNetworkButton.setEnabled(true);
@@ -322,7 +321,11 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
}
// parent.addView(view);
mStatusText.setText(R.string.wifi_setup_status_edit_network);
if (selectedAccessPoint.security == AccessPoint.SECURITY_NONE) {
mStatusText.setText(R.string.wifi_setup_status_unsecured_network);
} else {
mStatusText.setText(R.string.wifi_setup_status_edit_network);
}
mAddNetworkButton.setVisibility(View.GONE);
mRefreshButton.setVisibility(View.GONE);
mSkipOrNextButton.setVisibility(View.GONE);