PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate all MetricsProto enums to SettingsEnums

Browse Source 
Bug: 122855168
Test: rebuild
Change-Id: I962d9a71179f86b7cae9dc5e9a00e0aa1557dc76
This commit is contained in:
Fan Zhang
2019-01-16 13:49:47 -08:00
parent dbaa5459b8
commit 31b210017b
502 changed files with 1184 additions and 1347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/shortcut/CreateShortcut.java
View File

@@ -16,13 +16,12 @@
package com.android.settings.shortcut;
import static com.android.settings.search.actionbar.SearchMenuController
.NEED_SEARCH_ICON_IN_ACTION_BAR;
import static com.android.settings.search.actionbar.SearchMenuController.NEED_SEARCH_ICON_IN_ACTION_BAR;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
@@ -62,7 +61,7 @@ public class CreateShortcut extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SETTINGS_CREATE_SHORTCUT;
return SettingsEnums.SETTINGS_CREATE_SHORTCUT;
}
@Override

4
src/com/android/settings/shortcut/CreateShortcutPreferenceController.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.shortcut;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ActivityInfo;
@@ -42,7 +43,6 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceGroup;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.Settings.TetherSettingsActivity;
import com.android.settings.core.BasePreferenceController;
@@ -213,7 +213,7 @@ public class CreateShortcutPreferenceController extends BasePreferenceController
return;
}
mMetricsFeatureProvider.action(
mContext, MetricsProto.MetricsEvent.ACTION_SETTINGS_CREATE_SHORTCUT,
mContext, SettingsEnums.ACTION_SETTINGS_CREATE_SHORTCUT,
info.activityInfo.name);
}