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

Merge "Polish layout and UI for wifi setup" into honeycomb

Browse Source
This commit is contained in:
Daisuke Miyakawa
2011-01-18 16:26:18 -08:00
committed by Android (Google) Code Review
parent 9f1f6ca27a ee5576ce06
commit b213d30d2c
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
View File

@@ -87,7 +87,7 @@
android:layout_width="wrap_content"
android:minWidth="406dip"
android:layout_height="wrap_content"
android:minHeight="176dip"
android:minHeight="160dip"
android:layout_alignParentLeft="true"
android:visibility="gone" />
<View

4
res/values/strings.xml
View File

@@ -3036,6 +3036,10 @@ found in the list of installed applications.</string>
saying EAP can't be configured in SetupWizard flow.
[CHAR LIMIT=NONE] -->
<string name="wifi_setup_eap_not_supported">You can\u0027t configure an EAP Wi-Fi connection during setup. After setup, you can do that in Settings, under Wireless &amp; Networks.</string>
<!-- Message shown when the device is connecting a network [CHAR LIMIT=NONE] -->
<string name="wifi_setup_description_connecting">Connecting can take a few minutes...</string>
<!-- Message shown when the device is connected to a network [CHAR LIMIT=NONE] -->
<string name="wifi_setup_description_connected">Touch <b>Next</b> to continue with setup.\n\nTouch <b>Back</b> to connect to a different Wi-Fi network.</string>
<!-- Do not translate. This is a stub which will be removed soon. -->
<string name="time_zone_auto_stub" translatable="false">Select Time Zone</string>

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

@@ -258,6 +258,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
mAddNetworkButton.setVisibility(View.GONE);
mRefreshButton.setVisibility(View.GONE);
mBackButton.setVisibility(View.VISIBLE);
mBackButton.setText(R.string.wifi_setup_back);
mSkipOrNextButton.setVisibility(View.VISIBLE);
mSkipOrNextButton.setEnabled(true);
mHandler.removeCallbacks(mSkipButtonEnabler);
@@ -278,6 +279,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
}
private void showConnectingStatus() {
mBackButton.setVisibility(View.VISIBLE);
// We save this title and show it when authentication failed.
mEditingTitle = mTitleView.getText();
showConnectingTitle();
@@ -369,6 +371,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
mAddNetworkButton.setVisibility(View.GONE);
mRefreshButton.setVisibility(View.GONE);
mBackButton.setVisibility(View.VISIBLE);
mBackButton.setText(R.string.wifi_setup_back);
} else {
mConnectButton.setVisibility(View.VISIBLE);
@@ -382,6 +385,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
mAddNetworkButton.setVisibility(View.GONE);
mRefreshButton.setVisibility(View.GONE);
mBackButton.setVisibility(View.VISIBLE);
mBackButton.setText(R.string.wifi_setup_cancel);
}
}
@@ -399,6 +403,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
// Might be better to delay showing this button.
mBackButton.setVisibility(View.VISIBLE);
mBackButton.setText(R.string.wifi_setup_back);
// We need to restore visibility status when the device failed to connect the network.
final View wpsFieldView = findViewById(R.id.wps_fields);