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

auto import from //branches/cupcake_rel/...@138607

Browse Source
This commit is contained in:
The Android Open Source Project
2009-03-13 13:04:25 -07:00
parent 80a7a1dbf2
commit 72ed6feab2
28 changed files with 194 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/com/android/settings/wifi/AccessPointState.java
View File

@@ -47,24 +47,7 @@ public final class AccessPointState implements Comparable<AccessPointState>, Par
private static final String ADHOC_CAPABILITY = "[IBSS]";
/** String present in capabilities if the scan result is enterprise secured */
private static final String ENTERPRISE_CAPABILITY = "-EAP-";
// Localized strings for different security types
private static String LOCALIZED_WPA2;
private static String LOCALIZED_WPA;
private static String LOCALIZED_WEP;
private static String LOCALIZED_OPEN;
private static String LOCALIZED_UNKNOWN;
private static String LOCALIZED_VERBOSE_WPA2;
private static String LOCALIZED_VERBOSE_WPA;
private static String LOCALIZED_VERBOSE_WEP;
private static String LOCALIZED_VERBOSE_OPEN;
// Localized strings for various messages
private static String SUMMARY_NOT_IN_RANGE;
private static String SUMMARY_REMEMBERED;
private static String SUMMARY_CONNECTION_FAILED;
public static final String BSSID_ANY = "any";
public static final int NETWORK_ID_NOT_SET = -1;
/** This should be used with care! */
@@ -147,31 +130,8 @@ public final class AccessPointState implements Comparable<AccessPointState>, Par
void setContext(Context context) {
mContext = context;
setStrings();
}
private void setStrings() {
final Context c = mContext;
if (SUMMARY_NOT_IN_RANGE == null && c != null) {
SUMMARY_NOT_IN_RANGE = c.getString(R.string.summary_not_in_range);
SUMMARY_REMEMBERED = c.getString(R.string.summary_remembered);
SUMMARY_CONNECTION_FAILED = c.getString(R.string.summary_connection_failed);
LOCALIZED_OPEN = c.getString(R.string.wifi_security_open);
LOCALIZED_WEP = c.getString(R.string.wifi_security_wep);
LOCALIZED_WPA = c.getString(R.string.wifi_security_wpa);
LOCALIZED_WPA2 = c.getString(R.string.wifi_security_wpa2);
LOCALIZED_VERBOSE_OPEN = c.getString(R.string.wifi_security_verbose_open);
LOCALIZED_VERBOSE_WEP = c.getString(R.string.wifi_security_verbose_wep);
LOCALIZED_VERBOSE_WPA = c.getString(R.string.wifi_security_verbose_wpa);
LOCALIZED_VERBOSE_WPA2 = c.getString(R.string.wifi_security_verbose_wpa2);
LOCALIZED_UNKNOWN = c.getString(R.string.wifi_security_unknown);
}
}
public void setNetworkId(int networkId) {
this.networkId = networkId;
}
@@ -311,12 +271,12 @@ public final class AccessPointState implements Comparable<AccessPointState>, Par
}
public String getHumanReadableSecurity() {
if (security.equals(OPEN)) return LOCALIZED_OPEN;
else if (security.equals(WEP)) return LOCALIZED_WEP;
else if (security.equals(WPA)) return LOCALIZED_WPA;
else if (security.equals(WPA2)) return LOCALIZED_WPA2;
if (security.equals(OPEN)) return mContext.getString(R.string.wifi_security_open);
else if (security.equals(WEP)) return mContext.getString(R.string.wifi_security_wep);
else if (security.equals(WPA)) return mContext.getString(R.string.wifi_security_wpa);
else if (security.equals(WPA2)) return mContext.getString(R.string.wifi_security_wpa2);
return LOCALIZED_UNKNOWN;
return mContext.getString(R.string.wifi_security_unknown);
}
public void updateFromScanResult(ScanResult scanResult) {
@@ -719,22 +679,22 @@ public final class AccessPointState implements Comparable<AccessPointState>, Par
buildSummary(sb, WifiStatus.getPrintable(mContext, status), true);
} else if (!seen) {
buildSummary(sb, SUMMARY_NOT_IN_RANGE, true);
buildSummary(sb, mContext.getString(R.string.summary_not_in_range), true);
// Remembered comes second in this case
if (!primary && configured) {
buildSummary(sb, SUMMARY_REMEMBERED, true);
buildSummary(sb, mContext.getString(R.string.summary_remembered), true);
}
} else {
if (configured && disabled) {
// The connection failure overrides all in this case
return SUMMARY_CONNECTION_FAILED;
return mContext.getString(R.string.summary_connection_failed);
}
// Remembered comes first in this case
if (!primary && configured) {
buildSummary(sb, SUMMARY_REMEMBERED, true);
buildSummary(sb, mContext.getString(R.string.summary_remembered), true);
}
// If it is seen (and not the primary), show the security type
@@ -749,13 +709,13 @@ public final class AccessPointState implements Comparable<AccessPointState>, Par
private String getVerboseSecurity() {
if (WEP.equals(security)) {
return LOCALIZED_VERBOSE_WEP;
return mContext.getString(R.string.wifi_security_verbose_wep);
} else if (WPA.equals(security)) {
return LOCALIZED_VERBOSE_WPA;
return mContext.getString(R.string.wifi_security_verbose_wpa);
} else if (WPA2.equals(security)) {
return LOCALIZED_VERBOSE_WPA2;
return mContext.getString(R.string.wifi_security_verbose_wpa2);
} else if (OPEN.equals(security)) {
return LOCALIZED_VERBOSE_OPEN;
return mContext.getString(R.string.wifi_security_verbose_open);
} else {
return null;
}

82
src/com/android/settings/wifi/WifiStatus.java
View File

@@ -20,51 +20,9 @@ import com.android.settings.R;
import android.content.Context;
import android.net.NetworkInfo;
import android.net.wifi.WifiInfo;
import android.text.TextUtils;
public class WifiStatus {
// e.g., "Connecting"
public static String sScanning;
public static String sConnecting;
public static String sAuthenticating;
public static String sObtainingIp;
public static String sConnected;
public static String sDisconnecting;
public static String sDisconnected;
public static String sFailed;
// e.g., "Connecting to %1$s"
public static String sScanningFragment;
public static String sConnectingFragment;
public static String sAuthenticatingFragment;
public static String sObtainingIpFragment;
public static String sConnectedFragment;
public static String sDisconnectingFragment;
public static String sDisconnectedFragment;
public static String sFailedFragment;
private static void fillStrings(Context context) {
sScanning = context.getString(R.string.status_scanning);
sConnecting = context.getString(R.string.status_connecting);
sAuthenticating = context.getString(R.string.status_authenticating);
sObtainingIp = context.getString(R.string.status_obtaining_ip);
sConnected = context.getString(R.string.status_connected);
sDisconnecting = context.getString(R.string.status_disconnecting);
sDisconnected = context.getString(R.string.status_disconnected);
sFailed = context.getString(R.string.status_failed);
sScanningFragment = context.getString(R.string.fragment_status_scanning);
sConnectingFragment = context.getString(R.string.fragment_status_connecting);
sAuthenticatingFragment = context.getString(R.string.fragment_status_authenticating);
sObtainingIpFragment = context.getString(R.string.fragment_status_obtaining_ip);
sConnectedFragment = context.getString(R.string.fragment_status_connected);
sDisconnectingFragment = context.getString(R.string.fragment_status_disconnecting);
sDisconnectedFragment = context.getString(R.string.fragment_status_disconnected);
sFailedFragment = context.getString(R.string.fragment_status_failed);
}
public static String getStatus(Context context, String ssid,
NetworkInfo.DetailedState detailedState) {
@@ -85,27 +43,23 @@ public class WifiStatus {
public static String getPrintable(Context context,
NetworkInfo.DetailedState detailedState) {
if (sScanning == null) {
fillStrings(context);
}
switch (detailedState) {
case AUTHENTICATING:
return sAuthenticating;
return context.getString(R.string.status_authenticating);
case CONNECTED:
return sConnected;
return context.getString(R.string.status_connected);
case CONNECTING:
return sConnecting;
return context.getString(R.string.status_connecting);
case DISCONNECTED:
return sDisconnected;
return context.getString(R.string.status_disconnected);
case DISCONNECTING:
return sDisconnecting;
return context.getString(R.string.status_disconnecting);
case FAILED:
return sFailed;
return context.getString(R.string.status_failed);
case OBTAINING_IPADDR:
return sObtainingIp;
return context.getString(R.string.status_obtaining_ip);
case SCANNING:
return sScanning;
return context.getString(R.string.status_scanning);
default:
return null;
}
@@ -114,35 +68,31 @@ public class WifiStatus {
public static String getPrintableFragment(Context context,
NetworkInfo.DetailedState detailedState, String apName) {
if (sScanningFragment == null) {
fillStrings(context);
}
String fragment = null;
switch (detailedState) {
case AUTHENTICATING:
fragment = sAuthenticatingFragment;
fragment = context.getString(R.string.fragment_status_authenticating);
break;
case CONNECTED:
fragment = sConnectedFragment;
fragment = context.getString(R.string.fragment_status_connected);
break;
case CONNECTING:
fragment = sConnectingFragment;
fragment = context.getString(R.string.fragment_status_connecting);
break;
case DISCONNECTED:
fragment = sDisconnectedFragment;
fragment = context.getString(R.string.fragment_status_disconnected);
break;
case DISCONNECTING:
fragment = sDisconnectingFragment;
fragment = context.getString(R.string.fragment_status_disconnecting);
break;
case FAILED:
fragment = sFailedFragment;
fragment = context.getString(R.string.fragment_status_failed);
break;
case OBTAINING_IPADDR:
fragment = sObtainingIpFragment;
fragment = context.getString(R.string.fragment_status_obtaining_ip);
break;
case SCANNING:
fragment = sScanningFragment;
fragment = context.getString(R.string.fragment_status_scanning);
break;
}