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

Merge "Add feedback dialogs for WPS" into honeycomb

Browse Source
This commit is contained in:
Irfan Sheriff
2011-01-16 13:03:10 -08:00
committed by Android (Google) Code Review
parent f6bbf11a05 dee5b26892
commit 4de7499d7c
2 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/values/strings.xml
View File

@@ -948,10 +948,14 @@
<string name="wifi_network_setup">Network Setup</string>
<!-- Label for the text view for WPS pin input [CHAR LIMIT=50] -->
<string name="wifi_wps_pin">Enter pin from access point</string>
<!-- Title for the WPS pin display dialog [CHAR LIMIT=50] -->
<string name="wifi_wps_pin_method_configuration">WPS pin method configuration</string>
<!-- Text displayed in the WPS pin display dialog [CHAR LIMIT=50] -->
<!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
<string name="wifi_wps_setup_title">WPS Setup</string>
<!-- Text displayed in the WPS pin display dialog [CHAR LIMIT=75] -->
<string name="wifi_wps_pin_output">Enter the pin <xliff:g id="wps_pin">%1$s</xliff:g> on the access point</string>
<!-- Text displayed when WPS setup is in progress [CHAR LIMIT=75] -->
<string name="wifi_wps_in_progress">WPS is already in progress and can take tens of seconds to complete</string>
<!-- Text displayed when WPS fails to start [CHAR LIMIT=75] -->
<string name="wifi_wps_failed">Failed to start WPS, please try again</string>
<!-- Label for the SSID of the network -->
<string name="wifi_ssid">Network SSID</string>
<!-- Label for the security of the connection -->

34
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -37,7 +37,9 @@ import android.net.wifi.SupplicantState;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.net.wifi.WpsResult;
import android.net.wifi.WifiConfiguration.KeyMgmt;
import android.net.wifi.WpsConfiguration;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
@@ -571,18 +573,32 @@ public class WifiSettings extends SettingsPreferenceFragment
}
/* package */ void submit(WifiConfigController configController) {
switch(configController.chosenNetworkSetupMethod()) {
int networkSetup = configController.chosenNetworkSetupMethod();
switch(networkSetup) {
case WifiConfigController.WPS_PBC:
case WifiConfigController.WPS_PIN_FROM_ACCESS_POINT:
mWifiManager.startWps(configController.getWpsConfig());
break;
case WifiConfigController.WPS_PIN_FROM_DEVICE:
String pin = mWifiManager.startWps(configController.getWpsConfig());
new AlertDialog.Builder(getActivity())
.setTitle(R.string.wifi_wps_pin_method_configuration)
.setMessage(getResources().getString(R.string.wifi_wps_pin_output, pin))
.setPositiveButton(android.R.string.ok, null)
.show();
WpsResult result = mWifiManager.startWps(configController.getWpsConfig());
AlertDialog.Builder dialog = new AlertDialog.Builder(getActivity())
.setTitle(R.string.wifi_wps_setup_title)
.setPositiveButton(android.R.string.ok, null);
switch (result.status) {
case FAILURE:
dialog.setMessage(R.string.wifi_wps_failed);
dialog.show();
break;
case IN_PROGRESS:
dialog.setMessage(R.string.wifi_wps_in_progress);
dialog.show();
break;
default:
if (networkSetup == WifiConfigController.WPS_PIN_FROM_DEVICE) {
dialog.setMessage(getResources().getString(R.string.wifi_wps_pin_output,
result.pin));
dialog.show();
}
break;
}
break;
case WifiConfigController.MANUAL:
final WifiConfiguration config = configController.getConfig();