From 8b7dc08e775db599a1239a9d4a51d6912fee90d2 Mon Sep 17 00:00:00 2001 From: Chris Wren Date: Wed, 13 May 2015 13:44:36 -0400 Subject: [PATCH] replace temporary metrics categories with permanent ones. Bug: 21114836 Change-Id: I05ca033e2e15fc1ae4330453bbe50aaa6cd1ea6c --- src/com/android/settings/InstrumentedFragment.java | 8 +------- .../android/settings/applications/ManageApplications.java | 4 ++-- .../android/settings/applications/ManageDefaultApps.java | 6 ++---- .../android/settings/applications/UsageAccessDetails.java | 3 ++- src/com/android/settings/fuelgauge/HighPowerDetail.java | 3 ++- 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/com/android/settings/InstrumentedFragment.java b/src/com/android/settings/InstrumentedFragment.java index 1ee7e730ae2..da2a340e19f 100644 --- a/src/com/android/settings/InstrumentedFragment.java +++ b/src/com/android/settings/InstrumentedFragment.java @@ -24,13 +24,7 @@ import com.android.internal.logging.MetricsLogger; */ public abstract class InstrumentedFragment extends PreferenceFragment { // Declare new temporary categories here, starting after this value. - public static final int VIEW_CATEGORY_UNDECLARED = 100000; - - public static final int VIEW_CATEGORY_DEFAULT_APPS = VIEW_CATEGORY_UNDECLARED + 1; - public static final int VIEW_CATEGORY_STORAGE_APPS = VIEW_CATEGORY_UNDECLARED + 2; - public static final int VIEW_CATEGORY_USAGE_ACCESS_DETAIL = VIEW_CATEGORY_UNDECLARED + 3; - public static final int VIEW_CATEGORY_HIGH_POWER_DETAILS = VIEW_CATEGORY_UNDECLARED + 4; - public static final int VIEW_CATEGORY_HIGH_POWER_APPS = VIEW_CATEGORY_UNDECLARED + 5; + public static final int UNDECLARED = 100000; /** * Declare the view of this category. diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java index 1ef20f2a006..83a74f629d5 100644 --- a/src/com/android/settings/applications/ManageApplications.java +++ b/src/com/android/settings/applications/ManageApplications.java @@ -360,11 +360,11 @@ public class ManageApplications extends InstrumentedFragment case LIST_TYPE_DOMAINS_URLS: return MetricsLogger.MANAGE_DOMAIN_URLS; case LIST_TYPE_STORAGE: - return InstrumentedFragment.VIEW_CATEGORY_STORAGE_APPS; + return MetricsLogger.APPLICATIONS_STORAGE_APPS; case LIST_TYPE_USAGE_ACCESS: return MetricsLogger.USAGE_ACCESS; case LIST_TYPE_HIGH_POWER: - return InstrumentedFragment.VIEW_CATEGORY_HIGH_POWER_APPS; + return MetricsLogger.APPLICATIONS_HIGH_POWER_APPS; default: return MetricsLogger.VIEW_UNKNOWN; } diff --git a/src/com/android/settings/applications/ManageDefaultApps.java b/src/com/android/settings/applications/ManageDefaultApps.java index bca4b304c40..f4ec843300c 100644 --- a/src/com/android/settings/applications/ManageDefaultApps.java +++ b/src/com/android/settings/applications/ManageDefaultApps.java @@ -16,7 +16,6 @@ package com.android.settings.applications; -import android.annotation.Nullable; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; @@ -28,12 +27,11 @@ import android.os.UserHandle; import android.os.UserManager; import android.preference.Preference; import android.provider.SearchIndexableResource; -import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; -import android.view.View; import com.android.internal.content.PackageMonitor; +import com.android.internal.logging.MetricsLogger; import com.android.settings.InstrumentedFragment; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -194,7 +192,7 @@ public class ManageDefaultApps extends SettingsPreferenceFragment @Override protected int getMetricsCategory() { - return InstrumentedFragment.VIEW_CATEGORY_DEFAULT_APPS; + return MetricsLogger.APPLICATIONS_DEFAULT_APPS; } @Override diff --git a/src/com/android/settings/applications/UsageAccessDetails.java b/src/com/android/settings/applications/UsageAccessDetails.java index a11d7a7b14b..f65c4be12c3 100644 --- a/src/com/android/settings/applications/UsageAccessDetails.java +++ b/src/com/android/settings/applications/UsageAccessDetails.java @@ -32,6 +32,7 @@ import android.preference.SwitchPreference; import android.provider.Settings; import android.util.Log; +import com.android.internal.logging.MetricsLogger; import com.android.settings.InstrumentedFragment; import com.android.settings.R; import com.android.settings.applications.AppStateUsageBridge.UsageState; @@ -142,7 +143,7 @@ public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenc @Override protected int getMetricsCategory() { - return InstrumentedFragment.VIEW_CATEGORY_USAGE_ACCESS_DETAIL; + return MetricsLogger.APPLICATIONS_USAGE_ACCESS_DETAIL; } } diff --git a/src/com/android/settings/fuelgauge/HighPowerDetail.java b/src/com/android/settings/fuelgauge/HighPowerDetail.java index d82cb6f8fde..bd186718103 100644 --- a/src/com/android/settings/fuelgauge/HighPowerDetail.java +++ b/src/com/android/settings/fuelgauge/HighPowerDetail.java @@ -23,6 +23,7 @@ import android.preference.Preference; import android.preference.Preference.OnPreferenceChangeListener; import android.preference.SwitchPreference; +import com.android.internal.logging.MetricsLogger; import com.android.settings.InstrumentedFragment; import com.android.settings.R; import com.android.settings.applications.AppInfoWithHeader; @@ -69,7 +70,7 @@ public class HighPowerDetail extends AppInfoWithHeader implements OnPreferenceCh @Override protected int getMetricsCategory() { - return InstrumentedFragment.VIEW_CATEGORY_HIGH_POWER_DETAILS; + return MetricsLogger.FUELGAUGE_HIGH_POWER_DETAILS; } public static CharSequence getSummary(Context context, AppEntry entry) {