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

Use MetricsFeatureProvider for logging in Settings.

Browse Source 
Bug: 31664539
Test: make RunSettingsRoboTests for regression
Test: adb logcat -b events | egrep "(sysui_|notification_)" for
      verifying log

Change-Id: Id944be7c4ff9911aebee481c2df485542f1318f0
This commit is contained in:
Fan Zhang
2016-09-22 10:43:12 -07:00
parent f91cf3cfa7
commit aa71afe597
28 changed files with 204 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,9 +32,9 @@ import android.provider.Settings;
import android.widget.Switch;
import android.widget.Toast;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.search.Index;
import com.android.settings.widget.SwitchBar;
import com.android.settingslib.RestrictedLockUtils;
@@ -44,12 +44,16 @@ import com.android.settingslib.WirelessUtils;
import java.util.concurrent.atomic.AtomicBoolean;
public class WifiEnabler implements SwitchBar.OnSwitchChangeListener {
private final SwitchBar mSwitchBar;
private final WifiManager mWifiManager;
private final MetricsFeatureProvider mMetricsFeatureProvider;
private Context mContext;
private SwitchBar mSwitchBar;
private boolean mListeningToOnSwitchChange = false;
private AtomicBoolean mConnected = new AtomicBoolean(false);
private final WifiManager mWifiManager;
private boolean mStateMachineEvent;
private final IntentFilter mIntentFilter;
private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@@ -89,10 +93,11 @@ public class WifiEnabler implements SwitchBar.OnSwitchChangeListener {
}
};
public WifiEnabler(Context context, SwitchBar switchBar) {
public WifiEnabler(Context context, SwitchBar switchBar,
MetricsFeatureProvider metricsFeatureProvider) {
mContext = context;
mSwitchBar = switchBar;
mMetricsFeatureProvider = metricsFeatureProvider;
mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
mIntentFilter = new IntentFilter(WifiManager.WIFI_STATE_CHANGED_ACTION);
@@ -226,7 +231,7 @@ public class WifiEnabler implements SwitchBar.OnSwitchChangeListener {
if (mayDisableTethering(isChecked)) {
mWifiManager.setWifiApEnabled(null, false);
}
MetricsLogger.action(mContext,
mMetricsFeatureProvider.action(mContext,
isChecked ? MetricsEvent.ACTION_WIFI_ON : MetricsEvent.ACTION_WIFI_OFF);
if (!mWifiManager.setWifiEnabled(isChecked)) {
// Error

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

@@ -57,7 +57,6 @@ import android.widget.TextView;
import android.widget.TextView.BufferType;
import android.widget.Toast;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.LinkifyUtils;
import com.android.settings.R;
@@ -308,7 +307,7 @@ public class WifiSettings extends RestrictedSettingsFragment
*/
/* package */ WifiEnabler createWifiEnabler() {
final SettingsActivity activity = (SettingsActivity) getActivity();
return new WifiEnabler(activity, activity.getSwitchBar());
return new WifiEnabler(activity, activity.getSwitchBar(), mMetricsFeatureProvider);
}
@Override
@@ -411,7 +410,7 @@ public class WifiSettings extends RestrictedSettingsFragment
showDialog(WPS_PIN_DIALOG_ID);
return true;
case MENU_ID_SCAN:
MetricsLogger.action(getActivity(), MetricsEvent.ACTION_WIFI_FORCE_SCAN);
mMetricsFeatureProvider.action(getActivity(), MetricsEvent.ACTION_WIFI_FORCE_SCAN);
mWifiTracker.forceScan();
return true;
case MENU_ID_ADVANCED:
@@ -847,7 +846,7 @@ public class WifiSettings extends RestrictedSettingsFragment
}
/* package */ void forget() {
MetricsLogger.action(getActivity(), MetricsEvent.ACTION_WIFI_FORGET);
mMetricsFeatureProvider.action(getActivity(), MetricsEvent.ACTION_WIFI_FORGET);
if (!mSelectedAccessPoint.isSaved()) {
if (mSelectedAccessPoint.getNetworkInfo() != null &&
mSelectedAccessPoint.getNetworkInfo().getState() != State.DISCONNECTED) {
@@ -870,12 +869,12 @@ public class WifiSettings extends RestrictedSettingsFragment
}
protected void connect(final WifiConfiguration config) {
MetricsLogger.action(getActivity(), MetricsEvent.ACTION_WIFI_CONNECT);
mMetricsFeatureProvider.action(getActivity(), MetricsEvent.ACTION_WIFI_CONNECT);
mWifiManager.connect(config, mConnectListener);
}
protected void connect(final int networkId) {
MetricsLogger.action(getActivity(), MetricsEvent.ACTION_WIFI_CONNECT);
mMetricsFeatureProvider.action(getActivity(), MetricsEvent.ACTION_WIFI_CONNECT);
mWifiManager.connect(networkId, mConnectListener);
}
@@ -883,7 +882,7 @@ public class WifiSettings extends RestrictedSettingsFragment
* Called when "add network" button is pressed.
*/
/* package */ void onAddNetworkPressed() {
MetricsLogger.action(getActivity(), MetricsEvent.ACTION_WIFI_ADD_NETWORK);
mMetricsFeatureProvider.action(getActivity(), MetricsEvent.ACTION_WIFI_ADD_NETWORK);
// No exact access point is selected.
mSelectedAccessPoint = null;
showDialog(null, WifiConfigUiBase.MODE_CONNECT);