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

am d2cf4d3c: am a0587d02: Show correct title.

Browse Source 
* commit 'd2cf4d3cb72b15104c736b359335f104916ad9db':
  Show correct title.
This commit is contained in:
Daisuke Miyakawa
2011-01-18 08:48:08 -08:00
committed by Android Git Automerger
parent c378851629 d2cf4d3cb7
commit cf30f4f482
2 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/strings.xml
View File

@@ -2974,6 +2974,11 @@ found in the list of installed applications.</string>
The argument should be the name of the network.
[CHAR LIMIT=50] -->
<string name="wifi_setup_title_connecting_network">Connecting to Wi-Fi network <xliff:g id="network_name" example="Happy Mobile">%s</xliff:g>...</string>
<!-- Title shown in Wifi Setup For Setup Wizard with XL screen when
the device successfully connected to a network the user specified.
The argument should be the name of the network.
[CHAR LIMIT=50] -->
<string name="wifi_setup_title_connected_network">Connected to Wi-Fi network <xliff:g id="network_name" example="Happy Mobile">%s</xliff:g></string>
<!-- Title shown in Wifi Setup For Setup Wizard with XL screen when
a user is adding a network.
[CHAR LIMIT=50] -->

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

@@ -172,6 +172,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
}
private void restoreFirstButtonVisibilityState() {
showDefaultTitle();
mAddNetworkButton.setVisibility(View.VISIBLE);
mRefreshButton.setVisibility(View.VISIBLE);
mSkipOrNextButton.setVisibility(View.VISIBLE);
@@ -252,6 +253,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
mProgressBar.setIndeterminate(false);
mProgressBar.setProgress(2);
showConnectedTitle();
mConnectButton.setVisibility(View.GONE);
mAddNetworkButton.setVisibility(View.GONE);
mRefreshButton.setVisibility(View.GONE);
@@ -278,19 +280,37 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
private void showConnectingStatus() {
// We save this title and show it when authentication failed.
mEditingTitle = mTitleView.getText();
showTitleForNetworkEditing();
showConnectingTitle();
mProgressBar.setIndeterminate(false);
mProgressBar.setProgress(1);
setPaddingVisibility(View.VISIBLE);
}
private void showTitleForNetworkEditing() {
private void showDefaultTitle() {
mTitleView.setText(getString(R.string.wifi_setup_title));
}
private void showEditingTitle() {
if (TextUtils.isEmpty(mNetworkName) && mWifiConfig != null) {
mNetworkName = mWifiConfig.getController().getConfig().SSID;
}
mTitleView.setText(getString(R.string.wifi_setup_title_editing_network, mNetworkName));
}
private void showConnectingTitle() {
if (TextUtils.isEmpty(mNetworkName) && mWifiConfig != null) {
mNetworkName = mWifiConfig.getController().getConfig().SSID;
}
mTitleView.setText(getString(R.string.wifi_setup_title_connecting_network, mNetworkName));
}
private void showConnectedTitle() {
if (TextUtils.isEmpty(mNetworkName) && mWifiConfig != null) {
mNetworkName = mWifiConfig.getController().getConfig().SSID;
}
mTitleView.setText(getString(R.string.wifi_setup_title_connected_network, mNetworkName));
}
private void showScanningStatus() {
mProgressBar.setIndeterminate(true);
((Button)findViewById(R.id.wifi_setup_add_network)).setEnabled(false);
@@ -344,6 +364,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
selectedAccessPoint.security == AccessPoint.SECURITY_EAP) {
mConnectButton.setVisibility(View.GONE);
showEditingTitle();
mSkipOrNextButton.setVisibility(View.GONE);
mAddNetworkButton.setVisibility(View.GONE);
mRefreshButton.setVisibility(View.GONE);
@@ -356,6 +377,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
// In SetupWizard, we just show the button as "Connect" instead.
mConnectButton.setText(R.string.wifi_connect);
showEditingTitle();
mSkipOrNextButton.setVisibility(View.GONE);
mAddNetworkButton.setVisibility(View.GONE);
mRefreshButton.setVisibility(View.GONE);
@@ -493,7 +515,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
mTitleView.setText(mEditingTitle);
} else {
Log.w(TAG, "Title during editing/adding a network was empty.");
showTitleForNetworkEditing();
showEditingTitle();
}
// Restore View status which was tweaked on connection.