Update AP config status (3e5cfe8f) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/wifi/WifiApEnabler.java

+10 −6

Original line number	Diff line number	Diff line
		@@ -107,6 +107,14 @@ public class WifiApEnabler implements Preference.OnPreferenceChangeListener {
		return false;
		}

		void updateConfigSummary(WifiConfiguration wifiConfig) {
		String s = mContext.getString(
		com.android.internal.R.string.wifi_tether_configure_ssid_default);
		mCheckBox.setSummary(String.format(
		mContext.getString(R.string.wifi_tether_enabled_subtext),
		(wifiConfig == null) ? s : wifiConfig.SSID));
		}

		private void updateTetherState(Object[] available, Object[] tethered, Object[] errored) {
		boolean wifiTethered = false;
		boolean wifiErrored = false;
		@@ -125,12 +133,8 @@ public class WifiApEnabler implements Preference.OnPreferenceChangeListener {
		}

		if (wifiTethered) {
		WifiConfiguration mWifiConfig = mWifiManager.getWifiApConfiguration();
		String s = mContext.getString(
		com.android.internal.R.string.wifi_tether_configure_ssid_default);
		mCheckBox.setSummary(String.format(
		mContext.getString(R.string.wifi_tether_enabled_subtext),
		(mWifiConfig == null) ? s : mWifiConfig.SSID));
		WifiConfiguration wifiConfig = mWifiManager.getWifiApConfiguration();
		updateConfigSummary(wifiConfig);
		} else if (wifiErrored) {
		mCheckBox.setSummary(R.string.wifi_error);
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -122,6 +122,11 @@ public class WifiApSettings extends PreferenceActivity
		mWifiConfig.SSID,
		mWifiConfig.allowedKeyManagement.get(KeyMgmt.WPA_PSK) ?
		mSecurityType[WPA_INDEX] : mSecurityType[OPEN_INDEX]));
		/**
		* There is no tether notification on changing AP
		* configuration. Update status with new config.
		*/
		mWifiApEnabler.updateConfigSummary(mWifiConfig);
		}
		}
		}