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

[WifiSetup] Show MAC address in footer

Browse Source 
Show the MAC address in footer so that advanced users can configure
their router whitelist etc.

Bug: 6939795
Change-Id: I858d21fb68f67f74e5b7e3a1960ea4d7966acb29
This commit is contained in:
Maurice Lam
2015-04-27 18:24:16 -07:00
parent a8e22985d7
commit 572eb42e1d
2 changed files with 71 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.wifi;
import android.app.Dialog;
import android.net.wifi.WifiConfiguration;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@@ -46,6 +47,7 @@ public class WifiSettingsForSetupWizard extends WifiSettings {
private SetupWizardListLayout mLayout;
private View mAddOtherNetworkItem;
private TextView mEmptyFooter;
private View mMacAddressFooter;
private boolean mListLastEmpty = false;
@Override
@@ -66,6 +68,9 @@ public class WifiSettingsForSetupWizard extends WifiSettings {
}
});
mMacAddressFooter = inflater.inflate(R.layout.setup_wifi_mac_address, list, false);
list.addFooterView(mMacAddressFooter, null, false);
final NavigationBar navigationBar = mLayout.getNavigationBar();
if (navigationBar != null) {
WifiSetupActivity activity = (WifiSetupActivity) getActivity();
@@ -82,6 +87,8 @@ public class WifiSettingsForSetupWizard extends WifiSettings {
if (hasNextButton()) {
getNextButton().setVisibility(View.GONE);
}
updateMacAddress();
}
@Override
@@ -90,6 +97,12 @@ public class WifiSettingsForSetupWizard extends WifiSettings {
updateFooter(getPreferenceScreen().getPreferenceCount() == 0);
}
@Override
public void onWifiStateChanged(int state) {
super.onWifiStateChanged(state);
updateMacAddress();
}
@Override
public void registerForContextMenu(View view) {
// Suppressed during setup wizard
@@ -137,12 +150,14 @@ public class WifiSettingsForSetupWizard extends WifiSettings {
protected void updateFooter(boolean isEmpty) {
if (isEmpty != mListLastEmpty) {
final ListView list = getListView();
list.removeFooterView(mEmptyFooter);
list.removeFooterView(mAddOtherNetworkItem);
list.removeFooterView(mMacAddressFooter);
if (isEmpty) {
list.removeFooterView(mAddOtherNetworkItem);
list.addFooterView(mEmptyFooter, null, false);
} else {
list.removeFooterView(mEmptyFooter);
list.addFooterView(mAddOtherNetworkItem, null, true);
list.addFooterView(mMacAddressFooter, null, false);
}
mListLastEmpty = isEmpty;
}
@@ -158,4 +173,20 @@ public class WifiSettingsForSetupWizard extends WifiSettings {
}
}
}
private void updateMacAddress() {
if (mMacAddressFooter != null) {
String macAddress = null;
if (mWifiManager != null) {
android.net.wifi.WifiInfo connectionInfo = mWifiManager.getConnectionInfo();
if (connectionInfo != null) {
macAddress = connectionInfo.getMacAddress();
}
}
final TextView macAddressTextView =
(TextView) mMacAddressFooter.findViewById(R.id.mac_address);
macAddressTextView.setText(!TextUtils.isEmpty(macAddress) ?
macAddress : getString(R.string.status_unavailable));
}
}
}