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

log wifi actions from settings

Browse Source 
To start:
  enable
  disable
  forget
  connect
  add

Depends-On: I60163e44602b8e23b643b9103c324fa0e0d2c4c4
Change-Id: I52f40298db63f410ced2dbf5ba05d3ad098a85a2
This commit is contained in:
Chris Wren
2015-03-26 13:34:02 -04:00
parent ec5a3373db
commit f22e8c4c2e
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,7 @@ import android.provider.Settings;
import android.widget.Switch; import android.widget.Switch;
import android.widget.Toast; import android.widget.Toast;
import com.android.internal.logging.MetricsLogger;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.search.Index; import com.android.settings.search.Index;
import com.android.settings.widget.SwitchBar; import com.android.settings.widget.SwitchBar;
@@ -209,7 +210,8 @@ public class WifiEnabler implements SwitchBar.OnSwitchChangeListener {
(wifiApState == WifiManager.WIFI_AP_STATE_ENABLED))) { (wifiApState == WifiManager.WIFI_AP_STATE_ENABLED))) {
mWifiManager.setWifiApEnabled(null, false); mWifiManager.setWifiApEnabled(null, false);
} }
MetricsLogger.action(mContext,
isChecked ? MetricsLogger.ACTION_WIFI_ON : MetricsLogger.ACTION_WIFI_OFF);
if (!mWifiManager.setWifiEnabled(isChecked)) { if (!mWifiManager.setWifiEnabled(isChecked)) {
// Error // Error
mSwitchBar.setEnabled(true); mSwitchBar.setEnabled(true);

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

@@ -369,6 +369,7 @@ public class WifiSettings extends RestrictedSettingsFragment
showDialog(WPS_PIN_DIALOG_ID); showDialog(WPS_PIN_DIALOG_ID);
return true; return true;
case MENU_ID_SCAN: case MENU_ID_SCAN:
MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_FORCE_SCAN);
mWifiTracker.forceScan(); mWifiTracker.forceScan();
return true; return true;
case MENU_ID_ADD_NETWORK: case MENU_ID_ADD_NETWORK:
@@ -707,6 +708,7 @@ public class WifiSettings extends RestrictedSettingsFragment
} }
/* package */ void forget() { /* package */ void forget() {
MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_FORGET);
if (!mSelectedAccessPoint.isSaved()) { if (!mSelectedAccessPoint.isSaved()) {
if (mSelectedAccessPoint.getNetworkInfo().getState() != State.DISCONNECTED) { if (mSelectedAccessPoint.getNetworkInfo().getState() != State.DISCONNECTED) {
// Network is active but has no network ID - must be ephemeral. // Network is active but has no network ID - must be ephemeral.
@@ -728,10 +730,12 @@ public class WifiSettings extends RestrictedSettingsFragment
} }
protected void connect(final WifiConfiguration config) { protected void connect(final WifiConfiguration config) {
MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_CONNECT);
mWifiManager.connect(config, mConnectListener); mWifiManager.connect(config, mConnectListener);
} }
protected void connect(final int networkId) { protected void connect(final int networkId) {
MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_CONNECT);
mWifiManager.connect(networkId, mConnectListener); mWifiManager.connect(networkId, mConnectListener);
} }
@@ -748,6 +752,7 @@ public class WifiSettings extends RestrictedSettingsFragment
* Called when "add network" button is pressed. * Called when "add network" button is pressed.
*/ */
/* package */ void onAddNetworkPressed() { /* package */ void onAddNetworkPressed() {
MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_ADD_NETWORK);
// No exact access point is selected. // No exact access point is selected.
mSelectedAccessPoint = null; mSelectedAccessPoint = null;
showDialog(null, true); showDialog(null, true);