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

port settings over to new metrics enum

Browse Source 
Change-Id: I0b3efd2f4db773ccbc52bfe59ee8eb0dab9584fb
This commit is contained in:
Chris Wren
2016-01-26 18:04:01 -05:00
parent 6a83d7537d
commit 9d1bfd1e8d
143 changed files with 328 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@ import android.os.Bundle;
import android.security.Credentials;
import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceClickListener;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
@@ -39,7 +39,7 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment {
@Override
protected int getMetricsCategory() {
return MetricsLogger.WIFI_ADVANCED;
return MetricsEvent.WIFI_ADVANCED;
}
@Override

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

@@ -25,7 +25,7 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import android.util.Log;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -60,7 +60,7 @@ public class SavedAccessPointsWifiSettings extends SettingsPreferenceFragment
@Override
protected int getMetricsCategory() {
return MetricsLogger.WIFI_SAVED_ACCESS_POINTS;
return MetricsEvent.WIFI_SAVED_ACCESS_POINTS;
}
@Override

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

@@ -31,6 +31,7 @@ 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.search.Index;
import com.android.settings.widget.SwitchBar;
@@ -211,7 +212,7 @@ public class WifiEnabler implements SwitchBar.OnSwitchChangeListener {
mWifiManager.setWifiApEnabled(null, false);
}
MetricsLogger.action(mContext,
isChecked ? MetricsLogger.ACTION_WIFI_ON : MetricsLogger.ACTION_WIFI_OFF);
isChecked ? MetricsEvent.ACTION_WIFI_ON : MetricsEvent.ACTION_WIFI_OFF);
if (!mWifiManager.setWifiEnabled(isChecked)) {
// Error
mSwitchBar.setEnabled(true);

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

@@ -65,6 +65,7 @@ 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;
import com.android.settings.RestrictedSettingsFragment;
@@ -365,7 +366,7 @@ public class WifiSettings extends RestrictedSettingsFragment
@Override
protected int getMetricsCategory() {
return MetricsLogger.WIFI;
return MetricsEvent.WIFI;
}
@Override
@@ -416,7 +417,7 @@ public class WifiSettings extends RestrictedSettingsFragment
showDialog(WPS_PIN_DIALOG_ID);
return true;
case MENU_ID_SCAN:
MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_FORCE_SCAN);
MetricsLogger.action(getActivity(), MetricsEvent.ACTION_WIFI_FORCE_SCAN);
mWifiTracker.forceScan();
return true;
case MENU_ID_ADVANCED:
@@ -855,7 +856,7 @@ public class WifiSettings extends RestrictedSettingsFragment
}
/* package */ void forget() {
MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_FORGET);
MetricsLogger.action(getActivity(), MetricsEvent.ACTION_WIFI_FORGET);
if (!mSelectedAccessPoint.isSaved()) {
if (mSelectedAccessPoint.getNetworkInfo() != null &&
mSelectedAccessPoint.getNetworkInfo().getState() != State.DISCONNECTED) {
@@ -878,12 +879,12 @@ public class WifiSettings extends RestrictedSettingsFragment
}
protected void connect(final WifiConfiguration config) {
MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_CONNECT);
MetricsLogger.action(getActivity(), MetricsEvent.ACTION_WIFI_CONNECT);
mWifiManager.connect(config, mConnectListener);
}
protected void connect(final int networkId) {
MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_CONNECT);
MetricsLogger.action(getActivity(), MetricsEvent.ACTION_WIFI_CONNECT);
mWifiManager.connect(networkId, mConnectListener);
}
@@ -891,7 +892,7 @@ public class WifiSettings extends RestrictedSettingsFragment
* Called when "add network" button is pressed.
*/
/* package */ void onAddNetworkPressed() {
MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_ADD_NETWORK);
MetricsLogger.action(getActivity(), MetricsEvent.ACTION_WIFI_ADD_NETWORK);
// No exact access point is selected.
mSelectedAccessPoint = null;
showDialog(null, WifiConfigUiBase.MODE_CONNECT);

4
src/com/android/settings/wifi/p2p/WifiP2pSettings.java
View File

@@ -51,7 +51,7 @@ import android.view.MenuItem;
import android.widget.EditText;
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.SettingsPreferenceFragment;
@@ -492,7 +492,7 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
@Override
protected int getMetricsCategory() {
return MetricsLogger.WIFI_P2P;
return MetricsEvent.WIFI_P2P;
}
@Override