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

softAp UI changes

Browse Source 
Remove channel settings
Add subtext error handling
Remove WEP, keep WPA2 only for now

Bug: 2413908
Change-Id: Ie867e84a0705f0d2185eeb3a4c86a8227446a338
This commit is contained in:
Irfan Sheriff
2010-03-10 08:27:15 -08:00
parent 233880225a
commit 47ebb78954
6 changed files with 70 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/TetherSettings.java
View File

@@ -26,6 +26,8 @@ import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.net.ConnectivityManager;
import android.net.wifi.WifiManager;
import android.net.wifi.WifiConfiguration;
import android.os.Environment;
import android.preference.CheckBoxPreference;
import android.preference.Preference;
@@ -54,6 +56,7 @@ public class TetherSettings extends PreferenceActivity {
private PreferenceScreen mWifiApSettings;
private WifiApEnabler mWifiApEnabler;
private PreferenceScreen mTetherHelp;
private WifiManager mWifiManager;
private BroadcastReceiver mTetherChangeReceiver;
@@ -76,6 +79,8 @@ public class TetherSettings extends PreferenceActivity {
ConnectivityManager cm =
(ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
mWifiManager = (WifiManager)getSystemService(Context.WIFI_SERVICE);
mUsbRegexs = cm.getTetherableUsbRegexs();
if (mUsbRegexs.length == 0) {
getPreferenceScreen().removePreference(mUsbTether);
@@ -221,6 +226,17 @@ public class TetherSettings extends PreferenceActivity {
mUsbTether.setEnabled(false);
mUsbTether.setChecked(false);
}
if (wifiTethered) {
WifiConfiguration mWifiConfig = mWifiManager.getWifiApConfiguration();
String s = getString(com.android.internal.R.string.wifi_tether_configure_ssid_default);
mEnableWifiAp.setSummary(String.format(getString(R.string.wifi_tether_enabled_subtext),
(mWifiConfig == null) ? s : mWifiConfig.SSID));
}
if (wifiErrored) {
mEnableWifiAp.setSummary(R.string.wifi_error);
}
}
@Override