OG: Use system Metrics for Omni settings
Change-Id: If35ca623244bbdfd9c1804b44a3d01b493b321e7
diff --git a/src/org/omnirom/omnigears/ButtonBrightnessSettings.java b/src/org/omnirom/omnigears/ButtonBrightnessSettings.java
index 6ff3614..a308457 100644
--- a/src/org/omnirom/omnigears/ButtonBrightnessSettings.java
+++ b/src/org/omnirom/omnigears/ButtonBrightnessSettings.java
@@ -50,6 +50,9 @@
import org.omnirom.omnigears.R;
import org.omnirom.omnigears.preference.SeekBarPreference;
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
@@ -71,7 +74,7 @@
@Override
public int getMetricsCategory() {
- return OmniDashboardFragment.ACTION_SETTINGS_OMNI;
+ return MetricsEvent.OMNI_SETTINGS;
}
public void onCreate(Bundle savedInstanceState) {
diff --git a/src/org/omnirom/omnigears/ButtonSettings.java b/src/org/omnirom/omnigears/ButtonSettings.java
index ec25354..eca3a1e 100644
--- a/src/org/omnirom/omnigears/ButtonSettings.java
+++ b/src/org/omnirom/omnigears/ButtonSettings.java
@@ -36,6 +36,9 @@
import java.util.List;
import java.util.ArrayList;
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.SettingsPreferenceFragment;
@@ -64,7 +67,7 @@
@Override
public int getMetricsCategory() {
- return OmniDashboardFragment.ACTION_SETTINGS_OMNI;
+ return MetricsEvent.OMNI_SETTINGS;
}
@Override
diff --git a/src/org/omnirom/omnigears/DisplayRotation.java b/src/org/omnirom/omnigears/DisplayRotation.java
index ec8c494..3f4a981 100644
--- a/src/org/omnirom/omnigears/DisplayRotation.java
+++ b/src/org/omnirom/omnigears/DisplayRotation.java
@@ -30,6 +30,9 @@
import android.provider.Settings;
import com.android.internal.view.RotationPolicy;
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -70,7 +73,7 @@
@Override
public int getMetricsCategory() {
- return OmniDashboardFragment.ACTION_SETTINGS_OMNI;
+ return MetricsEvent.OMNI_SETTINGS;
}
@Override
diff --git a/src/org/omnirom/omnigears/OmniDashboardFragment.java b/src/org/omnirom/omnigears/OmniDashboardFragment.java
index bbde889..df77ad4 100644
--- a/src/org/omnirom/omnigears/OmniDashboardFragment.java
+++ b/src/org/omnirom/omnigears/OmniDashboardFragment.java
@@ -34,13 +34,11 @@
public class OmniDashboardFragment extends DashboardFragment {
private static final String TAG = "OmniDashboardFragment";
- public static final int ACTION_SETTINGS_OMNI = 948;
public static final String CATEGORY_OMNI = "com.android.settings.category.ia.omni";
@Override
public int getMetricsCategory() {
- return ACTION_SETTINGS_OMNI;
- //return MetricsProto.MetricsEvent.ACTION_SETTINGS_OMNI;
+ return MetricsProto.MetricsEvent.OMNI_SETTINGS;
}
@Override
diff --git a/src/org/omnirom/omnigears/batterylight/BatteryLightSettings.java b/src/org/omnirom/omnigears/batterylight/BatteryLightSettings.java
index 0bd47a9..383bce0 100644
--- a/src/org/omnirom/omnigears/batterylight/BatteryLightSettings.java
+++ b/src/org/omnirom/omnigears/batterylight/BatteryLightSettings.java
@@ -31,13 +31,15 @@
import android.view.MenuInflater;
import android.view.MenuItem;
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import org.omnirom.omnigears.preference.SystemSettingSwitchPreference;
-import org.omnirom.omnigears.OmniDashboardFragment;
import java.util.List;
import java.util.ArrayList;
@@ -77,7 +79,7 @@
@Override
public int getMetricsCategory() {
- return OmniDashboardFragment.ACTION_SETTINGS_OMNI;
+ return MetricsEvent.OMNI_SETTINGS;
}
@Override
diff --git a/src/org/omnirom/omnigears/interfacesettings/BarsSettings.java b/src/org/omnirom/omnigears/interfacesettings/BarsSettings.java
index 904b6dc..c87a0cd 100644
--- a/src/org/omnirom/omnigears/interfacesettings/BarsSettings.java
+++ b/src/org/omnirom/omnigears/interfacesettings/BarsSettings.java
@@ -26,6 +26,9 @@
import android.provider.Settings;
import android.util.Log;
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.R;
import com.android.settings.dashboard.SummaryLoader;
@@ -35,15 +38,13 @@
import java.util.List;
import java.util.ArrayList;
-import org.omnirom.omnigears.OmniDashboardFragment;
-
public class BarsSettings extends SettingsPreferenceFragment implements
Preference.OnPreferenceChangeListener, Indexable {
private static final String TAG = "BarsSettings";
@Override
public int getMetricsCategory() {
- return OmniDashboardFragment.ACTION_SETTINGS_OMNI;
+ return MetricsEvent.OMNI_SETTINGS;
}
@Override
diff --git a/src/org/omnirom/omnigears/interfacesettings/GlobalActionsSettings.java b/src/org/omnirom/omnigears/interfacesettings/GlobalActionsSettings.java
index 8b9f111..cbfe752 100644
--- a/src/org/omnirom/omnigears/interfacesettings/GlobalActionsSettings.java
+++ b/src/org/omnirom/omnigears/interfacesettings/GlobalActionsSettings.java
@@ -33,6 +33,9 @@
import android.text.TextUtils;
import android.util.Log;
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -44,7 +47,6 @@
import java.util.LinkedHashMap;
import org.omnirom.omnigears.preference.SecureSettingSwitchPreference;
-import org.omnirom.omnigears.OmniDashboardFragment;
public class GlobalActionsSettings extends SettingsPreferenceFragment implements
Preference.OnPreferenceChangeListener, Indexable {
@@ -56,7 +58,7 @@
@Override
public int getMetricsCategory() {
- return OmniDashboardFragment.ACTION_SETTINGS_OMNI;
+ return MetricsEvent.OMNI_SETTINGS;
}
@Override
diff --git a/src/org/omnirom/omnigears/interfacesettings/StyleSettings.java b/src/org/omnirom/omnigears/interfacesettings/StyleSettings.java
index 0451a97..46d038b 100644
--- a/src/org/omnirom/omnigears/interfacesettings/StyleSettings.java
+++ b/src/org/omnirom/omnigears/interfacesettings/StyleSettings.java
@@ -28,6 +28,9 @@
import android.provider.Settings;
import android.util.Log;
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -38,7 +41,6 @@
import java.util.List;
import java.util.ArrayList;
-import org.omnirom.omnigears.OmniDashboardFragment;
import org.omnirom.omnigears.PackageUtils;
public class StyleSettings extends SettingsPreferenceFragment implements
@@ -50,7 +52,7 @@
@Override
public int getMetricsCategory() {
- return OmniDashboardFragment.ACTION_SETTINGS_OMNI;
+ return MetricsEvent.OMNI_SETTINGS;
}
@Override
diff --git a/src/org/omnirom/omnigears/moresettings/MoreSettings.java b/src/org/omnirom/omnigears/moresettings/MoreSettings.java
index 7db55d4..1c8c1e3 100644
--- a/src/org/omnirom/omnigears/moresettings/MoreSettings.java
+++ b/src/org/omnirom/omnigears/moresettings/MoreSettings.java
@@ -32,11 +32,11 @@
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
-import org.omnirom.omnigears.OmniDashboardFragment;
-
import java.util.List;
import java.util.ArrayList;
@@ -45,7 +45,7 @@
@Override
public int getMetricsCategory() {
- return OmniDashboardFragment.ACTION_SETTINGS_OMNI;
+ return MetricsEvent.OMNI_SETTINGS;
}
@Override
diff --git a/src/org/omnirom/omnigears/system/DozeSettings.java b/src/org/omnirom/omnigears/system/DozeSettings.java
index be4ee48..b56c3be 100644
--- a/src/org/omnirom/omnigears/system/DozeSettings.java
+++ b/src/org/omnirom/omnigears/system/DozeSettings.java
@@ -47,7 +47,8 @@
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
-import org.omnirom.omnigears.OmniDashboardFragment;
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
public class DozeSettings extends SettingsPreferenceFragment {
private static final String TAG = "DozeSettings";
@@ -113,7 +114,7 @@
@Override
public int getMetricsCategory() {
- return OmniDashboardFragment.ACTION_SETTINGS_OMNI;
+ return MetricsEvent.OMNI_SETTINGS;
}
@Override
diff --git a/src/org/omnirom/omnigears/system/TimeInState.java b/src/org/omnirom/omnigears/system/TimeInState.java
index 66bd75b..73cb649 100644
--- a/src/org/omnirom/omnigears/system/TimeInState.java
+++ b/src/org/omnirom/omnigears/system/TimeInState.java
@@ -35,10 +35,12 @@
import java.util.HashMap;
import java.util.Map;
+import com.android.internal.logging.MetricsLogger;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
-import org.omnirom.omnigears.OmniDashboardFragment;
import org.omnirom.omnigears.system.CPUStateMonitor.CpuState;
import org.omnirom.omnigears.system.CPUStateMonitor.CPUStateMonitorException;
@@ -107,7 +109,7 @@
@Override
public int getMetricsCategory() {
- return OmniDashboardFragment.ACTION_SETTINGS_OMNI;
+ return MetricsEvent.OMNI_SETTINGS;
}
@Override