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

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

Merge "replace temporary metrics categories with permanent ones." into mnc-dev

parents e2862a00 8b7dc08e

src/com/android/settings/InstrumentedFragment.java

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

src/com/android/settings/applications/ManageApplications.java

+2 −2
Original line number Diff line number Diff line
@@ -358,11 +358,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;

        }

src/com/android/settings/applications/ManageDefaultApps.java

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

src/com/android/settings/applications/UsageAccessDetails.java

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

    }



}

src/com/android/settings/fuelgauge/HighPowerDetail.java

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