Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f8bb8ea authored by Chris Wren's avatar Chris Wren Committed by Android (Google) Code Review
Browse files

Merge "import new view enums into MetricsLogger" into mnc-dev

parents 536ed184 ef94267a

src/com/android/settings/InstrumentedFragment.java

+0 −3
Original line number Diff line number Diff line
@@ -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.

     *

src/com/android/settings/LegalSettings.java

+2 −1
Original line number Diff line number Diff line
@@ -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 =

src/com/android/settings/dashboard/SearchResultsSummary.java

+1 −1
Original line number Diff line number Diff line
@@ -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);