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

This commit is contained in:
Chris Wren
2015-05-13 18:05:54 +00:00
committed by Android (Google) Code Review
5 changed files with 9 additions and 15 deletions

View File

@@ -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;
}

View File

@@ -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

View File

@@ -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;
}
}