commit 47ebb7895457160c88592248a2e9049c14e2b625
author Irfan Sheriff <isheriff@google.com> Wed Mar 10 08:27:15 2010 -0800
committer Irfan Sheriff <isheriff@google.com> Tue Mar 16 16:03:13 2010 -0700
tree e4cb8b5f4b96bcaa7cb873642829306d081e3915
parent 233880225af70f8ec1d7722bf7bb68a730f7a281

softAp UI changes

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

Bug: 2413908
Change-Id: Ie867e84a0705f0d2185eeb3a4c86a8227446a338

src/com/android/settings/TetherSettings.java

diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index eea45c4..5770482 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -26,6 +26,8 @@
 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 @@
     private PreferenceScreen mWifiApSettings;
     private WifiApEnabler mWifiApEnabler;
     private PreferenceScreen mTetherHelp;
+    private WifiManager mWifiManager;
 
     private BroadcastReceiver mTetherChangeReceiver;
 
@@ -76,6 +79,8 @@
 
         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 @@
             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