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

4
src/com/android/settings/applications/assist/DefaultAssistPicker.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.applications.assist;
import android.app.ActivityManager;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -32,7 +33,6 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
import com.android.internal.app.AssistUtils;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
import com.android.settingslib.applications.DefaultAppInfo;
@@ -57,7 +57,7 @@ public class DefaultAssistPicker extends DefaultAppPickerFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DEFAULT_ASSIST_PICKER;
return SettingsEnums.DEFAULT_ASSIST_PICKER;
}
@Override

4
src/com/android/settings/applications/assist/DefaultVoiceInputPicker.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.applications.assist;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -24,7 +25,6 @@ import android.provider.Settings;
import android.text.TextUtils;
import com.android.internal.app.AssistUtils;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
import com.android.settingslib.applications.DefaultAppInfo;
@@ -40,7 +40,7 @@ public class DefaultVoiceInputPicker extends DefaultAppPickerFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DEFAULT_VOICE_INPUT_PICKER;
return SettingsEnums.DEFAULT_VOICE_INPUT_PICKER;
}
@Override

4
src/com/android/settings/applications/assist/ManageAssist.java
View File

@@ -16,10 +16,10 @@
package com.android.settings.applications.assist;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.gestures.AssistGestureSettingsPreferenceController;
@@ -59,7 +59,7 @@ public class ManageAssist extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.APPLICATIONS_MANAGE_ASSIST;
return SettingsEnums.APPLICATIONS_MANAGE_ASSIST;
}
@Override