From ef94267afd5df516dd6045360d6eaeb533841b77 Mon Sep 17 00:00:00 2001 From: Chris Wren Date: Fri, 10 Jul 2015 17:19:58 -0400 Subject: [PATCH] import new view enums into MetricsLogger Bug: 21114836 Change-Id: I9a6e00ab8d85726ca6505a28ca7a52aef5aa1e1a --- src/com/android/settings/InstrumentedFragment.java | 3 --- src/com/android/settings/LegalSettings.java | 3 ++- src/com/android/settings/dashboard/SearchResultsSummary.java | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/InstrumentedFragment.java b/src/com/android/settings/InstrumentedFragment.java index 453dbd0ad16..da2a340e19f 100644 --- a/src/com/android/settings/InstrumentedFragment.java +++ b/src/com/android/settings/InstrumentedFragment.java @@ -26,9 +26,6 @@ public abstract class InstrumentedFragment extends PreferenceFragment { // Declare new temporary categories here, starting after this value. public static final int UNDECLARED = 100000; - public static final int ABOUT_LEGAL_SETTINGS = UNDECLARED + 1; - public static final int ACTION_SEARCH_RESULTS = UNDECLARED + 2; - /** * Declare the view of this category. * diff --git a/src/com/android/settings/LegalSettings.java b/src/com/android/settings/LegalSettings.java index 5a9bf0bf5ed..cd91d204b97 100644 --- a/src/com/android/settings/LegalSettings.java +++ b/src/com/android/settings/LegalSettings.java @@ -26,6 +26,7 @@ import android.os.Bundle; import android.preference.PreferenceGroup; import android.provider.SearchIndexableResource; +import com.android.internal.logging.MetricsLogger; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; @@ -59,7 +60,7 @@ public class LegalSettings extends SettingsPreferenceFragment implements Indexab @Override protected int getMetricsCategory() { - return InstrumentedFragment.ABOUT_LEGAL_SETTINGS; + return MetricsLogger.ABOUT_LEGAL_SETTINGS; } public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = diff --git a/src/com/android/settings/dashboard/SearchResultsSummary.java b/src/com/android/settings/dashboard/SearchResultsSummary.java index 7a83a855c1e..ca764b30b8c 100644 --- a/src/com/android/settings/dashboard/SearchResultsSummary.java +++ b/src/com/android/settings/dashboard/SearchResultsSummary.java @@ -83,7 +83,7 @@ public class SearchResultsSummary extends InstrumentedFragment { @Override protected void onPostExecute(Cursor cursor) { if (!isCancelled()) { - MetricsLogger.action(getContext(), InstrumentedFragment.ACTION_SEARCH_RESULTS, + MetricsLogger.action(getContext(), MetricsLogger.ACTION_SEARCH_RESULTS, cursor.getCount()); setResultsCursor(cursor); setResultsVisibility(cursor.getCount() > 0);