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

Add subtypes to tron logging for Wifi toggles.

Browse Source 
am: b21815e320

Change-Id: Ia08aa862e311dba4af08a1a76c0083519dcdeeb9
This commit is contained in:
Stephen Chen
2016-11-04 17:22:30 +00:00
committed by android-build-merger
parent 8510f57509 b21815e320
commit 4ba959c7c4
3 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/wifi/WifiEnabler.java
View File

@@ -226,8 +226,13 @@ public class WifiEnabler implements SwitchBar.OnSwitchChangeListener {
if (mayDisableTethering(isChecked)) {
mWifiManager.setWifiApEnabled(null, false);
}
MetricsLogger.action(mContext,
isChecked ? MetricsEvent.ACTION_WIFI_ON : MetricsEvent.ACTION_WIFI_OFF);
if (isChecked) {
MetricsLogger.action(mContext, MetricsEvent.ACTION_WIFI_ON);
} else {
// Log if user was connected at the time of switching off.
MetricsLogger.action(mContext, MetricsEvent.ACTION_WIFI_OFF,
mConnected.get());
}
if (!mWifiManager.setWifiEnabled(isChecked)) {
// Error
mSwitchBar.setEnabled(true);

25
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -481,12 +481,13 @@ public class WifiSettings extends RestrictedSettingsFragment
}
switch (item.getItemId()) {
case MENU_ID_CONNECT: {
if (mSelectedAccessPoint.isSaved()) {
connect(mSelectedAccessPoint.getConfig());
boolean isSavedNetwork = mSelectedAccessPoint.isSaved();
if (isSavedNetwork) {
connect(mSelectedAccessPoint.getConfig(), isSavedNetwork);
} else if (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE) {
/** Bypass dialog for unsecured networks */
mSelectedAccessPoint.generateOpenNetworkConfig();
connect(mSelectedAccessPoint.getConfig());
connect(mSelectedAccessPoint.getConfig(), isSavedNetwork);
} else {
showDialog(mSelectedAccessPoint, WifiConfigUiBase.MODE_CONNECT);
}
@@ -519,7 +520,7 @@ public class WifiSettings extends RestrictedSettingsFragment
if (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE &&
!mSelectedAccessPoint.isSaved() && !mSelectedAccessPoint.isActive()) {
mSelectedAccessPoint.generateOpenNetworkConfig();
connect(mSelectedAccessPoint.getConfig());
connect(mSelectedAccessPoint.getConfig(), false /* isSavedNetwork */);
} else if (mSelectedAccessPoint.isSaved()) {
showDialog(mSelectedAccessPoint, WifiConfigUiBase.MODE_VIEW);
} else {
@@ -813,14 +814,14 @@ public class WifiSettings extends RestrictedSettingsFragment
if (config == null) {
if (mSelectedAccessPoint != null
&& mSelectedAccessPoint.isSaved()) {
connect(mSelectedAccessPoint.getConfig());
connect(mSelectedAccessPoint.getConfig(), true /* isSavedNetwork */);
}
} else if (configController.getMode() == WifiConfigUiBase.MODE_MODIFY) {
mWifiManager.save(config, mSaveListener);
} else {
mWifiManager.save(config, mSaveListener);
if (mSelectedAccessPoint != null) { // Not an "Add network"
connect(config);
connect(config, false /* isSavedNetwork */);
}
}
@@ -850,13 +851,17 @@ public class WifiSettings extends RestrictedSettingsFragment
changeNextButtonState(false);
}
protected void connect(final WifiConfiguration config) {
MetricsLogger.action(getActivity(), MetricsEvent.ACTION_WIFI_CONNECT);
protected void connect(final WifiConfiguration config, boolean isSavedNetwork) {
// Log subtype if configuration is a saved network.
MetricsLogger.action(getActivity(), MetricsEvent.ACTION_WIFI_CONNECT,
isSavedNetwork);
mWifiManager.connect(config, mConnectListener);
}
protected void connect(final int networkId) {
MetricsLogger.action(getActivity(), MetricsEvent.ACTION_WIFI_CONNECT);
protected void connect(final int networkId, boolean isSavedNetwork) {
// Log subtype if configuration is a saved network.
MetricsLogger.action(getActivity(), MetricsEvent.ACTION_WIFI_CONNECT,
isSavedNetwork);
mWifiManager.connect(networkId, mConnectListener);
}

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

@@ -130,17 +130,17 @@ public class WifiSettingsForSetupWizard extends WifiSettings {
}
@Override
protected void connect(final WifiConfiguration config) {
protected void connect(final WifiConfiguration config, boolean isSavedNetwork) {
WifiSetupActivity activity = (WifiSetupActivity) getActivity();
activity.networkSelected();
super.connect(config);
super.connect(config, isSavedNetwork);
}
@Override
protected void connect(final int networkId) {
protected void connect(final int networkId, boolean isSavedNetwork) {
WifiSetupActivity activity = (WifiSetupActivity) getActivity();
activity.networkSelected();
super.connect(networkId);
super.connect(networkId, isSavedNetwork);
}
@Override