port settings over to new metrics enum
Change-Id: I0b3efd2f4db773ccbc52bfe59ee8eb0dab9584fb
This commit is contained in:
@@ -21,7 +21,7 @@ import android.os.AsyncTask;
|
||||
import android.os.Bundle;
|
||||
import android.support.v7.preference.Preference;
|
||||
|
||||
import com.android.internal.logging.MetricsLogger;
|
||||
import com.android.internal.logging.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.SettingsPreferenceFragment;
|
||||
import com.android.settings.applications.PermissionsSummaryHelper.PermissionsResultCallback;
|
||||
@@ -72,7 +72,7 @@ public class AdvancedAppSettings extends SettingsPreferenceFragment implements
|
||||
|
||||
@Override
|
||||
protected int getMetricsCategory() {
|
||||
return MetricsLogger.APPLICATIONS_ADVANCED;
|
||||
return MetricsEvent.APPLICATIONS_ADVANCED;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -34,7 +34,7 @@ import android.util.Log;
|
||||
import android.view.View;
|
||||
import android.view.View.OnClickListener;
|
||||
|
||||
import com.android.internal.logging.MetricsLogger;
|
||||
import com.android.internal.logging.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.Utils;
|
||||
|
||||
@@ -213,6 +213,6 @@ public class AppLaunchSettings extends AppInfoWithHeader implements OnClickListe
|
||||
|
||||
@Override
|
||||
protected int getMetricsCategory() {
|
||||
return MetricsLogger.APPLICATIONS_APP_LAUNCH;
|
||||
return MetricsEvent.APPLICATIONS_APP_LAUNCH;
|
||||
}
|
||||
}
|
||||
|
@@ -38,7 +38,7 @@ import android.widget.LinearLayout;
|
||||
import android.widget.Switch;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.android.internal.logging.MetricsLogger;
|
||||
import com.android.internal.logging.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.InstrumentedFragment;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.SettingsActivity;
|
||||
@@ -181,7 +181,7 @@ public class AppOpsDetails extends InstrumentedFragment {
|
||||
|
||||
@Override
|
||||
protected int getMetricsCategory() {
|
||||
return MetricsLogger.APP_OPS_DETAILS;
|
||||
return MetricsEvent.APP_OPS_DETAILS;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -28,7 +28,7 @@ import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
import com.android.internal.logging.MetricsLogger;
|
||||
import com.android.internal.logging.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.InstrumentedFragment;
|
||||
import com.android.settings.R;
|
||||
|
||||
@@ -53,7 +53,7 @@ public class AppOpsSummary extends InstrumentedFragment {
|
||||
|
||||
@Override
|
||||
protected int getMetricsCategory() {
|
||||
return MetricsLogger.APP_OPS_SUMMARY;
|
||||
return MetricsEvent.APP_OPS_SUMMARY;
|
||||
}
|
||||
|
||||
class MyPagerAdapter extends FragmentPagerAdapter implements ViewPager.OnPageChangeListener {
|
||||
|
@@ -44,7 +44,7 @@ import android.view.View;
|
||||
import android.view.View.OnClickListener;
|
||||
import android.widget.Button;
|
||||
|
||||
import com.android.internal.logging.MetricsLogger;
|
||||
import com.android.internal.logging.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.Utils;
|
||||
import com.android.settings.deviceinfo.StorageWizardMoveConfirm;
|
||||
@@ -592,7 +592,7 @@ public class AppStorageSettings extends AppInfoWithHeader
|
||||
|
||||
@Override
|
||||
protected int getMetricsCategory() {
|
||||
return MetricsLogger.APPLICATIONS_APP_STORAGE;
|
||||
return MetricsEvent.APPLICATIONS_APP_STORAGE;
|
||||
}
|
||||
|
||||
class ClearCacheObserver extends IPackageDataObserver.Stub {
|
||||
|
@@ -29,7 +29,7 @@ import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
import com.android.internal.logging.MetricsLogger;
|
||||
import com.android.internal.logging.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.InstrumentedFragment;
|
||||
import com.android.settings.R;
|
||||
|
||||
@@ -39,7 +39,7 @@ public class BackgroundCheckSummary extends InstrumentedFragment {
|
||||
|
||||
@Override
|
||||
protected int getMetricsCategory() {
|
||||
return MetricsLogger.BACKGROUND_CHECK_SUMMARY;
|
||||
return MetricsEvent.BACKGROUND_CHECK_SUMMARY;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -31,7 +31,7 @@ import android.support.v7.preference.Preference.OnPreferenceChangeListener;
|
||||
import android.support.v7.preference.Preference.OnPreferenceClickListener;
|
||||
import android.util.Log;
|
||||
|
||||
import com.android.internal.logging.MetricsLogger;
|
||||
import com.android.internal.logging.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
|
||||
import com.android.settings.applications.AppStateOverlayBridge.OverlayState;
|
||||
@@ -152,7 +152,7 @@ public class DrawOverlayDetails extends AppInfoWithHeader implements OnPreferenc
|
||||
|
||||
@Override
|
||||
protected int getMetricsCategory() {
|
||||
return MetricsLogger.SYSTEM_ALERT_WINDOW_APPS;
|
||||
return MetricsEvent.SYSTEM_ALERT_WINDOW_APPS;
|
||||
}
|
||||
|
||||
public static CharSequence getSummary(Context context, AppEntry entry) {
|
||||
|
@@ -64,7 +64,7 @@ import android.view.ViewGroup;
|
||||
import android.widget.Button;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.TextView;
|
||||
import com.android.internal.logging.MetricsLogger;
|
||||
import com.android.internal.logging.MetricsProto.MetricsEvent;
|
||||
import com.android.internal.os.BatterySipper;
|
||||
import com.android.internal.os.BatteryStatsHelper;
|
||||
import com.android.settings.AppHeader;
|
||||
@@ -290,7 +290,7 @@ public class InstalledAppDetails extends AppInfoBase
|
||||
|
||||
@Override
|
||||
protected int getMetricsCategory() {
|
||||
return MetricsLogger.APPLICATIONS_INSTALLED_APP_DETAILS;
|
||||
return MetricsEvent.APPLICATIONS_INSTALLED_APP_DETAILS;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -46,7 +46,7 @@ import android.widget.Filterable;
|
||||
import android.widget.FrameLayout;
|
||||
import android.widget.ListView;
|
||||
import android.widget.Spinner;
|
||||
import com.android.internal.logging.MetricsLogger;
|
||||
import com.android.internal.logging.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.AppHeader;
|
||||
import com.android.settings.HelpUtils;
|
||||
import com.android.settings.InstrumentedFragment;
|
||||
@@ -376,23 +376,23 @@ public class ManageApplications extends InstrumentedFragment
|
||||
protected int getMetricsCategory() {
|
||||
switch (mListType) {
|
||||
case LIST_TYPE_MAIN:
|
||||
return MetricsLogger.MANAGE_APPLICATIONS;
|
||||
return MetricsEvent.MANAGE_APPLICATIONS;
|
||||
case LIST_TYPE_NOTIFICATION:
|
||||
return MetricsLogger.MANAGE_APPLICATIONS_NOTIFICATIONS;
|
||||
return MetricsEvent.MANAGE_APPLICATIONS_NOTIFICATIONS;
|
||||
case LIST_TYPE_DOMAINS_URLS:
|
||||
return MetricsLogger.MANAGE_DOMAIN_URLS;
|
||||
return MetricsEvent.MANAGE_DOMAIN_URLS;
|
||||
case LIST_TYPE_STORAGE:
|
||||
return MetricsLogger.APPLICATIONS_STORAGE_APPS;
|
||||
return MetricsEvent.APPLICATIONS_STORAGE_APPS;
|
||||
case LIST_TYPE_USAGE_ACCESS:
|
||||
return MetricsLogger.USAGE_ACCESS;
|
||||
return MetricsEvent.USAGE_ACCESS;
|
||||
case LIST_TYPE_HIGH_POWER:
|
||||
return MetricsLogger.APPLICATIONS_HIGH_POWER_APPS;
|
||||
return MetricsEvent.APPLICATIONS_HIGH_POWER_APPS;
|
||||
case LIST_TYPE_OVERLAY:
|
||||
return MetricsLogger.SYSTEM_ALERT_WINDOW_APPS;
|
||||
return MetricsEvent.SYSTEM_ALERT_WINDOW_APPS;
|
||||
case LIST_TYPE_WRITE_SETTINGS:
|
||||
return MetricsLogger.SYSTEM_ALERT_WINDOW_APPS;
|
||||
return MetricsEvent.SYSTEM_ALERT_WINDOW_APPS;
|
||||
default:
|
||||
return MetricsLogger.VIEW_UNKNOWN;
|
||||
return MetricsEvent.VIEW_UNKNOWN;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -25,7 +25,7 @@ import android.provider.Settings;
|
||||
import android.support.v14.preference.SwitchPreference;
|
||||
import android.support.v7.preference.Preference;
|
||||
|
||||
import com.android.internal.logging.MetricsLogger;
|
||||
import com.android.internal.logging.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.SettingsPreferenceFragment;
|
||||
import com.android.settings.voice.VoiceInputListPreference;
|
||||
@@ -71,7 +71,7 @@ public class ManageAssist extends SettingsPreferenceFragment
|
||||
|
||||
@Override
|
||||
protected int getMetricsCategory() {
|
||||
return MetricsLogger.APPLICATIONS_MANAGE_ASSIST;
|
||||
return MetricsEvent.APPLICATIONS_MANAGE_ASSIST;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -31,7 +31,7 @@ import android.text.TextUtils;
|
||||
import android.util.Log;
|
||||
|
||||
import com.android.internal.content.PackageMonitor;
|
||||
import com.android.internal.logging.MetricsLogger;
|
||||
import com.android.internal.logging.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.SettingsPreferenceFragment;
|
||||
import com.android.settings.search.BaseSearchIndexProvider;
|
||||
@@ -191,7 +191,7 @@ public class ManageDefaultApps extends SettingsPreferenceFragment
|
||||
|
||||
@Override
|
||||
protected int getMetricsCategory() {
|
||||
return MetricsLogger.APPLICATIONS_DEFAULT_APPS;
|
||||
return MetricsEvent.APPLICATIONS_DEFAULT_APPS;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -40,7 +40,7 @@ import android.view.Menu;
|
||||
import android.view.MenuInflater;
|
||||
import android.view.MenuItem;
|
||||
import android.view.View;
|
||||
import com.android.internal.logging.MetricsLogger;
|
||||
import com.android.internal.logging.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.AppHeader;
|
||||
import com.android.settings.CancellablePreference;
|
||||
import com.android.settings.CancellablePreference.OnCancelListener;
|
||||
@@ -122,7 +122,7 @@ public class ProcessStatsDetail extends SettingsPreferenceFragment {
|
||||
|
||||
@Override
|
||||
protected int getMetricsCategory() {
|
||||
return MetricsLogger.APPLICATIONS_PROCESS_STATS_DETAIL;
|
||||
return MetricsEvent.APPLICATIONS_PROCESS_STATS_DETAIL;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -25,7 +25,7 @@ import android.widget.ProgressBar;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.android.internal.app.ProcessStats;
|
||||
import com.android.internal.logging.MetricsLogger;
|
||||
import com.android.internal.logging.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.InstrumentedFragment;
|
||||
import com.android.settings.R;
|
||||
|
||||
@@ -87,7 +87,7 @@ public class ProcessStatsMemDetail extends InstrumentedFragment {
|
||||
|
||||
@Override
|
||||
protected int getMetricsCategory() {
|
||||
return MetricsLogger.APPLICATIONS_PROCESS_STATS_MEM_DETAIL;
|
||||
return MetricsEvent.APPLICATIONS_PROCESS_STATS_MEM_DETAIL;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -22,7 +22,7 @@ import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.Preference.OnPreferenceClickListener;
|
||||
import android.text.format.Formatter;
|
||||
import android.text.format.Formatter.BytesResult;
|
||||
import com.android.internal.logging.MetricsLogger;
|
||||
import com.android.internal.logging.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.SummaryPreference;
|
||||
import com.android.settings.Utils;
|
||||
@@ -103,7 +103,7 @@ public class ProcessStatsSummary extends ProcessStatsBase implements OnPreferenc
|
||||
|
||||
@Override
|
||||
protected int getMetricsCategory() {
|
||||
return MetricsLogger.PROCESS_STATS_SUMMARY;
|
||||
return MetricsEvent.PROCESS_STATS_SUMMARY;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -28,7 +28,7 @@ import android.view.MenuInflater;
|
||||
import android.view.MenuItem;
|
||||
|
||||
import com.android.internal.app.ProcessStats;
|
||||
import com.android.internal.logging.MetricsLogger;
|
||||
import com.android.internal.logging.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.SettingsActivity;
|
||||
import com.android.settings.applications.ProcStatsData.MemInfo;
|
||||
@@ -92,7 +92,7 @@ public class ProcessStatsUi extends ProcessStatsBase {
|
||||
|
||||
@Override
|
||||
protected int getMetricsCategory() {
|
||||
return MetricsLogger.APPLICATIONS_PROCESS_STATS_UI;
|
||||
return MetricsEvent.APPLICATIONS_PROCESS_STATS_UI;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -32,7 +32,7 @@ import android.view.ViewGroup;
|
||||
import android.widget.Button;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.android.internal.logging.MetricsLogger;
|
||||
import com.android.internal.logging.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.InstrumentedFragment;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.Utils;
|
||||
@@ -535,7 +535,7 @@ public class RunningServiceDetails extends InstrumentedFragment
|
||||
|
||||
@Override
|
||||
protected int getMetricsCategory() {
|
||||
return MetricsLogger.RUNNING_SERVICE_DETAILS;
|
||||
return MetricsEvent.RUNNING_SERVICE_DETAILS;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -33,7 +33,7 @@ import android.support.v7.preference.Preference.OnPreferenceChangeListener;
|
||||
import android.support.v7.preference.Preference.OnPreferenceClickListener;
|
||||
import android.util.Log;
|
||||
|
||||
import com.android.internal.logging.MetricsLogger;
|
||||
import com.android.internal.logging.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.applications.AppStateUsageBridge.UsageState;
|
||||
|
||||
@@ -163,7 +163,7 @@ public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenc
|
||||
|
||||
@Override
|
||||
protected int getMetricsCategory() {
|
||||
return MetricsLogger.APPLICATIONS_USAGE_ACCESS_DETAIL;
|
||||
return MetricsEvent.APPLICATIONS_USAGE_ACCESS_DETAIL;
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -31,7 +31,7 @@ import android.support.v7.preference.Preference.OnPreferenceChangeListener;
|
||||
import android.support.v7.preference.Preference.OnPreferenceClickListener;
|
||||
import android.util.Log;
|
||||
|
||||
import com.android.internal.logging.MetricsLogger;
|
||||
import com.android.internal.logging.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
|
||||
import com.android.settings.applications.AppStateWriteSettingsBridge.WriteSettingsState;
|
||||
@@ -154,7 +154,7 @@ public class WriteSettingsDetails extends AppInfoWithHeader implements OnPrefere
|
||||
|
||||
@Override
|
||||
protected int getMetricsCategory() {
|
||||
return MetricsLogger.SYSTEM_ALERT_WINDOW_APPS;
|
||||
return MetricsEvent.SYSTEM_ALERT_WINDOW_APPS;
|
||||
}
|
||||
|
||||
public static CharSequence getSummary(Context context, AppEntry entry) {
|
||||
|
Reference in New Issue
Block a user