Move temporary metrics constants to proto
Change-Id: I8fb3ac22df7bdc52039dd640f7696ebd32281f0b
diff --git a/src/com/android/settings/InstrumentedFragment.java b/src/com/android/settings/InstrumentedFragment.java
index 9c0c9be..b4fb818 100644
--- a/src/com/android/settings/InstrumentedFragment.java
+++ b/src/com/android/settings/InstrumentedFragment.java
@@ -28,27 +28,6 @@
// Declare new temporary categories here, starting after this value.
public static final int UNDECLARED = 100000;
- public static final int ACCESSIBILITY_TOGGLE_AUTOCLICK = UNDECLARED + 1;
- public static final int SOUND = UNDECLARED + 2;
- public static final int CONFIGURE_NOTIFICATION = UNDECLARED + 3;
- public static final int CONFIGURE_WIFI = UNDECLARED + 4;
- public static final int DISPLAY_SCREEN_ZOOM = UNDECLARED + 5;
- public static final int ACCESSIBILITY_FONT_SIZE = UNDECLARED + 6;
- public static final int DATA_USAGE_LIST = UNDECLARED + 7;
- public static final int BILLING_CYCLE = UNDECLARED + 8;
- public static final int APP_DATA_USAGE = UNDECLARED + 9;
- public static final int USER_LOCALE_LIST = UNDECLARED + 10;
- public static final int VIRTUAL_KEYBOARDS = UNDECLARED + 11;
- public static final int PHYSICAL_KEYBOARDS = UNDECLARED + 12;
- public static final int ENABLE_VIRTUAL_KEYBOARDS = UNDECLARED + 13;
- public static final int DATA_SAVER_SUMMARY = UNDECLARED + 14;
- public static final int DATA_USAGE_UNRESTRICTED_ACCESS = UNDECLARED + 15;
-
- // Used for generic logging of Settings Preference Persistence, should not be used
- // outside SharedPreferencesLogger.
- public static final int ACTION_GENERIC_PACKAGE = UNDECLARED + 16;
- public static final int SPECIAL_ACCESS = UNDECLARED + 17;
-
/**
* Declare the view of this category.
*
diff --git a/src/com/android/settings/SharedPreferencesLogger.java b/src/com/android/settings/SharedPreferencesLogger.java
index ae2c4e5..20da218 100644
--- a/src/com/android/settings/SharedPreferencesLogger.java
+++ b/src/com/android/settings/SharedPreferencesLogger.java
@@ -24,6 +24,7 @@
import android.os.AsyncTask;
import android.text.TextUtils;
import android.util.Log;
+import com.android.internal.logging.MetricsProto.MetricsEvent;
import java.util.Map;
import java.util.Set;
@@ -99,7 +100,7 @@
private void logPackageName(String key, String value) {
MetricsLogger.histogram(mContext, mTag + "/" + key, 1);
- MetricsLogger.action(mContext, InstrumentedFragment.ACTION_GENERIC_PACKAGE,
+ MetricsLogger.action(mContext, MetricsEvent.ACTION_GENERIC_PACKAGE,
mTag + "/" + key + "|" + value);
}
diff --git a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
index b625d75..daa0c82 100644
--- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
@@ -24,6 +24,7 @@
import android.view.accessibility.AccessibilityManager;
import android.widget.Switch;
+import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.InstrumentedFragment;
import com.android.settings.R;
import com.android.settings.SeekBarPreference;
@@ -101,7 +102,7 @@
@Override
protected int getMetricsCategory() {
- return InstrumentedFragment.ACCESSIBILITY_TOGGLE_AUTOCLICK;
+ return MetricsEvent.ACCESSIBILITY_TOGGLE_AUTOCLICK;
}
@Override
diff --git a/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java
index 264da37..1d55501 100644
--- a/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java
@@ -16,16 +16,15 @@
package com.android.settings.accessibility;
-import com.android.settings.InstrumentedFragment;
-import com.android.settings.R;
-import com.android.settings.PreviewSeekBarPreferenceFragment;
-
import android.annotation.Nullable;
import android.content.ContentResolver;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.os.Bundle;
import android.provider.Settings;
+import com.android.internal.logging.MetricsProto.MetricsEvent;
+import com.android.settings.PreviewSeekBarPreferenceFragment;
+import com.android.settings.R;
/**
* Preference fragment used to control font size.
@@ -75,7 +74,7 @@
@Override
protected int getMetricsCategory() {
- return InstrumentedFragment.ACCESSIBILITY_FONT_SIZE;
+ return MetricsEvent.ACCESSIBILITY_FONT_SIZE;
}
/**
diff --git a/src/com/android/settings/applications/SpecialAccessSettings.java b/src/com/android/settings/applications/SpecialAccessSettings.java
index 8320b29..812c8c3 100644
--- a/src/com/android/settings/applications/SpecialAccessSettings.java
+++ b/src/com/android/settings/applications/SpecialAccessSettings.java
@@ -15,7 +15,7 @@
package com.android.settings.applications;
import android.os.Bundle;
-import com.android.settings.InstrumentedFragment;
+import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
@@ -28,6 +28,6 @@
@Override
protected int getMetricsCategory() {
- return InstrumentedFragment.SPECIAL_ACCESS;
+ return MetricsEvent.SPECIAL_ACCESS;
}
}
diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java
index 05ba3c6..11b100c 100644
--- a/src/com/android/settings/datausage/AppDataUsage.java
+++ b/src/com/android/settings/datausage/AppDataUsage.java
@@ -37,8 +37,8 @@
import android.util.ArraySet;
import android.view.View;
import android.widget.AdapterView;
+import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.AppHeader;
-import com.android.settings.InstrumentedFragment;
import com.android.settings.R;
import com.android.settings.applications.AppInfoBase;
import com.android.settingslib.AppItem;
@@ -287,7 +287,7 @@
@Override
protected int getMetricsCategory() {
- return InstrumentedFragment.APP_DATA_USAGE;
+ return MetricsEvent.APP_DATA_USAGE;
}
private AdapterView.OnItemSelectedListener mCycleListener =
diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java
index e00170d..be05af7 100644
--- a/src/com/android/settings/datausage/BillingCycleSettings.java
+++ b/src/com/android/settings/datausage/BillingCycleSettings.java
@@ -33,7 +33,7 @@
import android.widget.EditText;
import android.widget.NumberPicker;
import android.widget.Spinner;
-import com.android.settings.InstrumentedFragment;
+import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settingslib.NetworkPolicyEditor;
import com.android.settingslib.net.DataUsageController;
@@ -136,7 +136,7 @@
@Override
protected int getMetricsCategory() {
- return InstrumentedFragment.BILLING_CYCLE;
+ return MetricsEvent.BILLING_CYCLE;
}
private void setPolicyLimitBytes(long limitBytes) {
diff --git a/src/com/android/settings/datausage/DataSaverSummary.java b/src/com/android/settings/datausage/DataSaverSummary.java
index dc8f125..e12afbf 100644
--- a/src/com/android/settings/datausage/DataSaverSummary.java
+++ b/src/com/android/settings/datausage/DataSaverSummary.java
@@ -18,7 +18,7 @@
import android.os.Bundle;
import android.support.v7.preference.Preference;
import android.widget.Switch;
-import com.android.settings.InstrumentedFragment;
+import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
@@ -90,7 +90,7 @@
@Override
protected int getMetricsCategory() {
- return InstrumentedFragment.DATA_SAVER_SUMMARY;
+ return MetricsEvent.DATA_SAVER_SUMMARY;
}
@Override
diff --git a/src/com/android/settings/datausage/DataUsageList.java b/src/com/android/settings/datausage/DataUsageList.java
index bb24aef..b32ea01 100644
--- a/src/com/android/settings/datausage/DataUsageList.java
+++ b/src/com/android/settings/datausage/DataUsageList.java
@@ -46,7 +46,7 @@
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemSelectedListener;
import android.widget.Spinner;
-import com.android.settings.InstrumentedFragment;
+import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settingslib.AppItem;
import com.android.settingslib.net.ChartData;
@@ -110,7 +110,7 @@
@Override
protected int getMetricsCategory() {
- return InstrumentedFragment.DATA_USAGE_LIST;
+ return MetricsEvent.DATA_USAGE_LIST;
}
@Override
diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccess.java b/src/com/android/settings/datausage/UnrestrictedDataAccess.java
index d53905f..96fd7f8 100644
--- a/src/com/android/settings/datausage/UnrestrictedDataAccess.java
+++ b/src/com/android/settings/datausage/UnrestrictedDataAccess.java
@@ -24,7 +24,7 @@
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
-import com.android.settings.InstrumentedFragment;
+import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.applications.AppStateBaseBridge;
@@ -190,7 +190,7 @@
@Override
protected int getMetricsCategory() {
- return InstrumentedFragment.DATA_USAGE_UNRESTRICTED_ACCESS;
+ return MetricsEvent.DATA_USAGE_UNRESTRICTED_ACCESS;
}
@Override
diff --git a/src/com/android/settings/display/ScreenZoomSettings.java b/src/com/android/settings/display/ScreenZoomSettings.java
index f6049c7..d72efdc 100644
--- a/src/com/android/settings/display/ScreenZoomSettings.java
+++ b/src/com/android/settings/display/ScreenZoomSettings.java
@@ -16,19 +16,18 @@
package com.android.settings.display;
-import com.android.settings.InstrumentedFragment;
-import com.android.settings.R;
-import com.android.settings.PreviewSeekBarPreferenceFragment;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-import com.android.settings.search.SearchIndexableRaw;
-
import android.annotation.Nullable;
import android.content.Context;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.os.Bundle;
import android.view.Display;
+import com.android.internal.logging.MetricsProto.MetricsEvent;
+import com.android.settings.PreviewSeekBarPreferenceFragment;
+import com.android.settings.R;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settings.search.SearchIndexableRaw;
import java.util.ArrayList;
import java.util.List;
@@ -95,7 +94,7 @@
@Override
protected int getMetricsCategory() {
- return InstrumentedFragment.DISPLAY_SCREEN_ZOOM;
+ return MetricsEvent.DISPLAY_SCREEN_ZOOM;
}
/** Index provider used to expose this fragment in search. */
diff --git a/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java b/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java
index a8a7086..1de3fcc 100644
--- a/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java
+++ b/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java
@@ -27,9 +27,8 @@
import android.support.v7.preference.PreferenceScreen;
import android.view.inputmethod.InputMethodInfo;
import android.view.inputmethod.InputMethodManager;
-
+import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
-import com.android.settings.InstrumentedFragment;
import com.android.settings.SettingsPreferenceFragment;
import java.text.Collator;
@@ -83,7 +82,7 @@
@Override
protected int getMetricsCategory() {
- return InstrumentedFragment.ENABLE_VIRTUAL_KEYBOARDS;
+ return MetricsEvent.ENABLE_VIRTUAL_KEYBOARDS;
}
private void updateInputMethodPreferenceViews() {
diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
index 0a6192e..e6254ad 100644
--- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
+++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
@@ -29,19 +29,19 @@
import android.os.Bundle;
import android.os.Handler;
import android.provider.Settings.Secure;
+import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceChangeListener;
import android.support.v7.preference.PreferenceCategory;
-import android.support.v14.preference.SwitchPreference;
import android.util.Pair;
import android.view.InputDevice;
import android.view.inputmethod.InputMethodInfo;
import android.view.inputmethod.InputMethodManager;
import android.view.inputmethod.InputMethodSubtype;
import com.android.internal.inputmethod.InputMethodUtils;
+import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.util.Preconditions;
import com.android.settings.R;
-import com.android.settings.InstrumentedFragment;
import com.android.settings.Settings;
import com.android.settings.SettingsPreferenceFragment;
@@ -161,7 +161,7 @@
@Override
protected int getMetricsCategory() {
- return InstrumentedFragment.PHYSICAL_KEYBOARDS;
+ return MetricsEvent.PHYSICAL_KEYBOARDS;
}
private void updateHardKeyboards() {
diff --git a/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java b/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java
index b6ca9f2..fe81a81 100644
--- a/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java
+++ b/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java
@@ -26,10 +26,9 @@
import android.support.v7.preference.Preference;
import android.view.inputmethod.InputMethodInfo;
import android.view.inputmethod.InputMethodManager;
-
+import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.util.Preconditions;
import com.android.settings.R;
-import com.android.settings.InstrumentedFragment;
import com.android.settings.SettingsPreferenceFragment;
import java.text.Collator;
@@ -68,7 +67,7 @@
@Override
protected int getMetricsCategory() {
- return InstrumentedFragment.VIRTUAL_KEYBOARDS;
+ return MetricsEvent.VIRTUAL_KEYBOARDS;
}
private void updateInputMethodPreferenceViews() {
diff --git a/src/com/android/settings/localepicker/LocaleListEditor.java b/src/com/android/settings/localepicker/LocaleListEditor.java
index 18bec15..a816f7a 100644
--- a/src/com/android/settings/localepicker/LocaleListEditor.java
+++ b/src/com/android/settings/localepicker/LocaleListEditor.java
@@ -31,11 +31,10 @@
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
-
import com.android.internal.app.LocalePicker;
import com.android.internal.app.LocalePickerWithRegion;
import com.android.internal.app.LocaleStore;
-import com.android.settings.InstrumentedFragment;
+import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
@@ -58,7 +57,7 @@
@Override
protected int getMetricsCategory() {
- return InstrumentedFragment.USER_LOCALE_LIST;
+ return MetricsEvent.USER_LOCALE_LIST;
}
@Override
diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java
index 7a47891..f8ac7dd 100644
--- a/src/com/android/settings/notification/ConfigureNotificationSettings.java
+++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java
@@ -29,9 +29,8 @@
import android.support.v7.preference.Preference.OnPreferenceChangeListener;
import android.support.v7.preference.TwoStatePreference;
import android.util.Log;
-
+import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.InstrumentedFragment;
import com.android.settings.R;
import com.android.settings.RestrictedListPreference.RestrictedItem;
import com.android.settings.SettingsPreferenceFragment;
@@ -42,7 +41,6 @@
import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS;
import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS;
-
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
public class ConfigureNotificationSettings extends SettingsPreferenceFragment {
@@ -68,7 +66,7 @@
@Override
protected int getMetricsCategory() {
- return InstrumentedFragment.CONFIGURE_NOTIFICATION;
+ return MetricsEvent.CONFIGURE_NOTIFICATION;
}
@Override
diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java
index 33721d7..4a44a1d 100644
--- a/src/com/android/settings/notification/SoundSettings.java
+++ b/src/com/android/settings/notification/SoundSettings.java
@@ -49,8 +49,7 @@
import android.support.v7.preference.Preference.OnPreferenceChangeListener;
import android.support.v7.preference.TwoStatePreference;
import android.util.Log;
-
-import com.android.settings.InstrumentedFragment;
+import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.RingtonePreference;
import com.android.settings.SettingsPreferenceFragment;
@@ -119,7 +118,7 @@
@Override
protected int getMetricsCategory() {
- return InstrumentedFragment.SOUND;
+ return MetricsEvent.SOUND;
}
@Override
diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java
index 54ce036..fa9c1ed 100644
--- a/src/com/android/settings/wifi/ConfigureWifiSettings.java
+++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java
@@ -33,8 +33,8 @@
import android.text.TextUtils;
import android.util.Log;
import android.widget.Toast;
+import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.AppListSwitchPreference;
-import com.android.settings.InstrumentedFragment;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
@@ -277,7 +277,7 @@
@Override
protected int getMetricsCategory() {
- return InstrumentedFragment.CONFIGURE_WIFI;
+ return MetricsEvent.CONFIGURE_WIFI;
}
private final BroadcastReceiver mReceiver = new BroadcastReceiver() {